Mercurial > vim
view src/xpm_w32.c @ 33863:3b8089d550eb v9.0.2141
patch 9.0.2141: [security]: buffer-overflow in suggest_trie_walk
Commit: https://github.com/vim/vim/commit/0fb375aae608d7306b4baf9c1f906961f32e2abf
Author: Christian Brabandt <cb@256bit.org>
Date: Wed Nov 29 10:23:39 2023 +0100
patch 9.0.2141: [security]: buffer-overflow in suggest_trie_walk
Problem: [security]: buffer-overflow in suggest_trie_walk
Solution: Check n before using it as index into byts array
Basically, n as an index into the byts array, can point to beyond the byts
array. So let's double check, that n is within the expected range after
incrementing it from sp->ts_curi and bail out if it would be invalid.
Reported by @henices, thanks!
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 10 Dec 2023 15:16:03 +0100 |
parents | 15539899a112 |
children |
line wrap: on
line source
/* vi:set ts=8 sts=4 sw=4 noet: * * Load XPM image. * * This function is placed in separate file because Xpm headers conflict with * Vim ones :( * * Written by Sergey Khorev. * http://iamphet.nm.ru/vim/index.html */ #ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN #endif #include <windows.h> #include "xpm_w32.h" // Engage Windows support in libXpm #define FOR_MSW #include "xpm.h" /* * Tries to load an Xpm image from the file "filename". * Returns -1 on failure. * Returns 0 on success and stores image and mask BITMAPS in "hImage" and * "hShape". */ int LoadXpmImage( char *filename, HBITMAP *hImage, HBITMAP *hShape) { XImage *img; // loaded image XImage *shp; // shapeimage XpmAttributes attr; int res; HDC hdc = CreateCompatibleDC(NULL); attr.valuemask = 0; res = XpmReadFileToImage(&hdc, filename, &img, &shp, &attr); DeleteDC(hdc); if (res < 0) return -1; if (shp == NULL) { if (img) XDestroyImage(img); return -1; } *hImage = img->bitmap; *hShape = shp->bitmap; return 0; }