ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comctl32/monthcal: Add parameter validation to MCM_HITTEST handler.

Browse Source
This commit is contained in:
Nikolay Sivov 2009-09-26 23:26:53 +04:00 committed by Alexandre Julliard
parent 1224cc461d
commit 69080d6d29
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/comctl32/monthcal.c
View File

@ -1141,6 +1141,7 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht)
DWORD retval; DWORD retval;
int day,wday,wnum; int day,wday,wnum;
if(!lpht || lpht->cbSize < MCHITTESTINFO_V1_SIZE) return -1;
x = lpht->pt.x; x = lpht->pt.x;
y = lpht->pt.y; y = lpht->pt.y;
@ -1417,6 +1418,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam)
InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE);
} }
ht.cbSize = sizeof(MCHITTESTINFO);
ht.pt.x = (short)LOWORD(lParam); ht.pt.x = (short)LOWORD(lParam);
ht.pt.y = (short)HIWORD(lParam); ht.pt.y = (short)HIWORD(lParam);
TRACE("(%d, %d)\n", ht.pt.x, ht.pt.y); TRACE("(%d, %d)\n", ht.pt.x, ht.pt.y);
@ -1550,6 +1552,7 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam)
redraw = TRUE; redraw = TRUE;
} }
ht.cbSize = sizeof(MCHITTESTINFO);
ht.pt.x = (short)LOWORD(lParam); ht.pt.x = (short)LOWORD(lParam);
ht.pt.y = (short)HIWORD(lParam); ht.pt.y = (short)HIWORD(lParam);
hit = MONTHCAL_HitTest(infoPtr, &ht); hit = MONTHCAL_HitTest(infoPtr, &ht);
@ -1628,6 +1631,7 @@ MONTHCAL_MouseMove(MONTHCAL_INFO *infoPtr, LPARAM lParam)
if(!(infoPtr->status & MC_SEL_LBUTDOWN)) return 0; if(!(infoPtr->status & MC_SEL_LBUTDOWN)) return 0;
ht.cbSize = sizeof(MCHITTESTINFO);
ht.pt.x = (short)LOWORD(lParam); ht.pt.x = (short)LOWORD(lParam);
ht.pt.y = (short)HIWORD(lParam); ht.pt.y = (short)HIWORD(lParam);

17
dlls/comctl32/tests/monthcal.c
View File

@ -867,6 +867,19 @@ static void test_monthcal_hittest(void)
hwnd = create_monthcal_control(0); hwnd = create_monthcal_control(0);
/* test with invalid structure size */
mchit.cbSize = MCHITTESTINFO_V1_SIZE - 1;
mchit.pt.x = 0;
mchit.pt.y = 0;
res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit);
expect(0, mchit.pt.x);
expect(0, mchit.pt.y);
expect(-1, res);
expect(0, mchit.uHit);
/* test with invalid pointer */
res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)NULL);
expect(-1, res);
flush_sequences(sequences, NUM_MSG_SEQUENCES); flush_sequences(sequences, NUM_MSG_SEQUENCES);
st.wYear = 2007; st.wYear = 2007;
@ -882,7 +895,7 @@ static void test_monthcal_hittest(void)
expect(1,res); expect(1,res);
/* (0, 0) is the top left of the control and should not be active */ /* (0, 0) is the top left of the control and should not be active */
mchit.cbSize = sizeof(MCHITTESTINFO); mchit.cbSize = MCHITTESTINFO_V1_SIZE;
mchit.pt.x = 0; mchit.pt.x = 0;
mchit.pt.y = 0; mchit.pt.y = 0;
res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit);
@ -1051,7 +1064,7 @@ static void test_monthcal_todaylink(void)
flush_sequences(sequences, NUM_MSG_SEQUENCES); flush_sequences(sequences, NUM_MSG_SEQUENCES);
/* (70, 370) is in active area - today link */ /* (70, 370) is in active area - today link */
mchit.cbSize = sizeof(MCHITTESTINFO); mchit.cbSize = MCHITTESTINFO_V1_SIZE;
mchit.pt.x = 70; mchit.pt.x = 70;
mchit.pt.y = 370; mchit.pt.y = 370;
res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit);

7
include/commctrl.h
View File

@ -4702,8 +4702,15 @@ typedef struct {
POINT pt; POINT pt;
UINT uHit; UINT uHit;
SYSTEMTIME st; SYSTEMTIME st;
/* Vista */
RECT rc;
INT iOffset;
INT iRow;
INT iCol;
} MCHITTESTINFO, *PMCHITTESTINFO; } MCHITTESTINFO, *PMCHITTESTINFO;
#define MCHITTESTINFO_V1_SIZE CCSIZEOF_STRUCT(MCHITTESTINFO, st)
typedef struct tagNMSELCHANGE typedef struct tagNMSELCHANGE
{ {
NMHDR nmhdr; NMHDR nmhdr;