Mercurial > vim
view pixmaps/quest.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 * quest_xpm[] = { /* width height ncolors cpp [x_hot y_hot] */ "34 34 4 1 0 0", /* colors */ " s none m none c none", ". s bottomShadowColor m black c #5D6069", "X s iconColor2 m white c #FFFFFF", "o s iconColor1 m black c #000000", /* pixels */ " ", " ........ ", " ...XXXXXXXX... ", " ..XXXXXXXXXXXXXX.. ", " .XXXXXXXXXXXXXXXXXX. ", " .XXXXXXXXoooooXXXXXXXo ", " .XXXXXXXXoXXXXooXXXXXXXo ", " .XXXXXXXXoooXXXXooXXXXXXXo ", " .XXXXXXXXXooooXXXooXXXXXXXXo ", " .XXXXXXXXXXooXXXoooXXXXXXXXo. ", " .XXXXXXXXXXXXXXXooooXXXXXXXXXo. ", " .XXXXXXXXXXXXXXooooXXXXXXXXXXo. ", " .XXXXXXXXXXXXXoooooXXXXXXXXXXo.. ", " .XXXXXXXXXXXXoooooXXXXXXXXXXXo.. ", " .XXXXXXXXXXXXoooXXXXXXXXXXXXXo.. ", " .XXXXXXXXXXXXooXXXXXXXXXXXXXXo.. ", " .XXXXXXXXXXXXoXXXXXXXXXXXXXXXo.. ", " .XXXXXXXXXXXoXXXXXXXXXXXXXXo... ", " .XXXXXXXXXXXXXXXXXXXXXXXXXXo... ", " .XXXXXXXXXXooXXXXXXXXXXXXo... ", " oXXXXXXXXooooXXXXXXXXXXo.... ", " oXXXXXXXXooXXXXXXXXXXo.... ", " oXXXXXXXXXXXXXXXXXXo.... ", " ooXXXXXXXXXXXXXXoo.... ", " .oooXXXXXXXXooo..... ", " ...oooXXXXo....... ", " ....oXXXo..... ", " .oXXXo.. ", " oXXo.. ", " oXo.. ", " oo.. ", " ... ", " .. ", " "};