Mercurial > vim
view pixmaps/error.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 * error_xpm[] = { /* width height ncolors cpp [x_hot y_hot] */ "34 34 4 1 0 0", /* colors */ " s none m none c none", ". s iconColor3 m black c #FF0000", "X s bottomShadowColor m black c #5D6069", "o s iconColor2 m white c #FFFFFF", /* pixels */ " ", " ........ ", " ............ ", " ................ ", " .................. ", " ....................X ", " ......................X ", " ........................X ", " .......o..........o.......X ", " ......ooo........ooo......X ", " ......ooooo......ooooo......X ", " .......ooooo....ooooo.......X ", " .........ooooo..ooooo.........X ", " ..........oooooooooo..........X ", " ...........oooooooo...........XX ", " ............oooooo............XX ", " ............oooooo............XX ", " ...........oooooooo...........XX ", " ..........oooooooooo..........XX ", " .........ooooo..ooooo.........XX ", " .......ooooo....ooooo.......XX ", " ......ooooo......ooooo......XX ", " ......ooo........ooo......XXX ", " .......o..........o.......XX ", " ........................XXX ", " ......................XXX ", " X....................XXX ", " X..................XXX ", " X................XXX ", " XX............XXXX ", " XX........XXXXX ", " XXXXXXXXXXX ", " XXXXXXX ", " "};