Mercurial > vim
view src/xpm_w32.c @ 33262:6eac4f616293 v9.0.1899
patch 9.0.1899: potential buffer overflow in PBYTE macro
Commit: https://github.com/vim/vim/commit/ffb13674d1af1c90beb229867ec989e4fb232df3
Author: Christian Brabandt <cb@256bit.org>
Date: Fri Sep 15 20:22:02 2023 +0200
patch 9.0.1899: potential buffer overflow in PBYTE macro
Problem: potential buffer overflow in PBYTE macro
Solution: Check returned memline length
closes: #13083
the PBYTE macro is used to put byte c at a position lp of the returned
memline. However, in case of unexpected errors ml_get_buf() may return
either "???" or an empty line in which case it is quite likely that we
are causing a buffer overrun.
Therefore, switch the macro PBYTE (which is only used in ops.c anyhow)
to a function, that verifies that we will only try to access within the
given length of the buffer.
Also, since the macro is only used in ops.c, move the definition from
macros.h to ops.c
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Fri, 15 Sep 2023 20:30:07 +0200 |
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; }