Module: wine Branch: master Commit: 8af406fb00054cd611de8c8bf54c926524eb0f0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8af406fb00054cd611de8c8bf5...
Author: Marcus Meissner marcus@jet.franken.de Date: Sat Oct 13 16:58:05 2012 +0200
winefile: Check index before buffer overread (Coverity).
---
programs/winefile/winefile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 366aa9c..23388c1 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -3163,7 +3163,7 @@ static void set_header(Pane* pane) item.mask = HDI_WIDTH; item.cxy = 0;
- for(; x+pane->widths[i]<scroll_pos && i<COLUMNS; i++) { + for(; (i < COLUMNS) && (x+pane->widths[i] < scroll_pos); i++) { x += pane->widths[i]; SendMessageW(pane->hwndHeader, HDM_SETITEMW, i, (LPARAM)&item); } @@ -3173,7 +3173,7 @@ static void set_header(Pane* pane) item.cxy = x - scroll_pos; SendMessageW(pane->hwndHeader, HDM_SETITEMW, i++, (LPARAM)&item);
- for(; i<COLUMNS; i++) { + for(; i < COLUMNS; i++) { item.cxy = pane->widths[i]; x += pane->widths[i]; SendMessageW(pane->hwndHeader, HDM_SETITEMW, i, (LPARAM)&item);