Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[0.4.9][WIN32SS] Require at least the amount of extra memory, not exact amount

Browse source 
Fixes 3 application crashes:
CORE-15576 "Civilization II Multiplayer Gold Edition crashes when trying to open a map"
CORE-13924 "Click-n-type Virtual Keyboard 3.03.4012 from rapps crash when opening program preferences"
CORE-8790 "IceChat crashes with OutofMemory"

It regressed around SVN r56947, r56948, r56949.

cherry picked from commit 0.4.12-dev-417-g
e022d8d7cb
This commit is contained in:
Joachim Henze 2020-11-01 02:13:21 +01:00
parent 8377b4fd23
commit 2a9249b546
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
win32ss/user/ntuser/scrollbar.c
View file

@ -86,7 +86,7 @@ IntGetSBData(PWND pwnd, INT Bar)
case SB_VERT: case SB_VERT:
return &pSBInfo->Vert; return &pSBInfo->Vert;
case SB_CTL: case SB_CTL:
if ( pwnd->cbwndExtra != (sizeof(SBWND)-sizeof(WND)) ) if ( pwnd->cbwndExtra < (sizeof(SBWND)-sizeof(WND)) )
{ {
ERR("IntGetSBData Wrong Extra bytes for CTL Scrollbar!\n"); ERR("IntGetSBData Wrong Extra bytes for CTL Scrollbar!\n");
return 0; return 0;

4
win32ss/user/user32/controls/scrollbar.c
View file

@ -100,7 +100,7 @@ IntGetSBData(PWND pwnd, INT Bar)
case SB_VERT: case SB_VERT:
return &pSBInfo->Vert; return &pSBInfo->Vert;
case SB_CTL: case SB_CTL:
if ( pwnd->cbwndExtra != (sizeof(SBWND)-sizeof(WND)) ) if ( pwnd->cbwndExtra < (sizeof(SBWND)-sizeof(WND)) )
{ {
ERR("IntGetSBData Wrong Extra bytes for CTL Scrollbar!\n"); ERR("IntGetSBData Wrong Extra bytes for CTL Scrollbar!\n");
return 0; return 0;
@ -1186,7 +1186,7 @@ ScrollBarWndProc_common(WNDPROC DefWindowProc, HWND Wnd, UINT Msg, WPARAM wParam
if (!pWnd->fnid) if (!pWnd->fnid)
{ {
TRACE("ScrollBar CTL size %d\n", (sizeof(SBWND)-sizeof(WND))); TRACE("ScrollBar CTL size %d\n", (sizeof(SBWND)-sizeof(WND)));
if ( pWnd->cbwndExtra != (sizeof(SBWND)-sizeof(WND)) ) if ( pWnd->cbwndExtra < (sizeof(SBWND)-sizeof(WND)) )
{ {
ERR("Wrong Extra bytes for Scrollbar!\n"); ERR("Wrong Extra bytes for Scrollbar!\n");
return 0; return 0;