Mercurial > vim
view pixmaps/tb_close.xpm @ 33422:25d250a74bb6 v9.0.1969
patch 9.0.1969: [security] buffer-overflow in trunc_string()
Commit: https://github.com/vim/vim/commit/3bd7fa12e146c6051490d048a4acbfba974eeb04
Author: Christian Brabandt <cb@256bit.org>
Date: Mon Oct 2 20:59:08 2023 +0200
patch 9.0.1969: [security] buffer-overflow in trunc_string()
Problem: buffer-overflow in trunc_string()
Solution: Add NULL at end of buffer
Currently trunc_string() assumes that when the string is too long,
buf[e-1] will always be writeable. But that assumption may not always be
true. The condition currently looks like this
else if (e + 3 < buflen)
[...]
else
{
// can't fit in the "...", just truncate it
buf[e - 1] = NUL;
}
but this means, we may run into the last else clause with e still being
larger than buflen. So a buffer overflow occurs.
So instead of using `buf[e - 1]`, let's just always
truncate at `buf[buflen - 1]` which should always be writable.
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Mon, 02 Oct 2023 21:30:04 +0200 |
parents | 3fc0f57ecb91 |
children |
line wrap: on
line source
/* XPM */ static char * tb_close_xpm[] = { /* width height ncolors cpp [x_hot y_hot] */ "18 18 7 1 0 0", /* colors */ " s none m none c none", ". c #880000 m black", "X s iconColor1 m black c #000000", "o s iconColor3 m black c #FF0000", "O s topShadowColor m none c #DCDEE5", "+ s iconColor2 m none c #FFFFFF", "@ s bottomShadowColor m black c #5D6069", /* pixels */ " ", " ..XXXXXXXXX. ", " .oo.OOOOOOO.o. ", " .oo.O+OOO.oo. ", " .oo.OOO.oo.@ ", " X.oo.O.oo.X@ ", " XO.oo.oo.+X@ ", " XOO.ooo.O+X@ ", " XOO.ooo.O+X@ ", " XO.oo.oo.+X@ ", " X.oo.O.oo.X@ ", " .oo.OOO.oo.@ ", " .oo.OOOOO.oo. ", " .oo.OOOOOOO.oo. ", " ..+++++++++.o. ", " XXXXXXXXXXX. ", " @@@@@@@@@ ", " "};