comctl32/dpa: Fix parameter validation in DPA_LoadStream().
This commit is contained in:
parent
b07ca01527
commit
c8f8e5da11
|
@ -84,7 +84,7 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, PFNDPASTREAM loadProc,
|
|||
{
|
||||
HRESULT errCode;
|
||||
LARGE_INTEGER position;
|
||||
ULARGE_INTEGER newPosition;
|
||||
ULARGE_INTEGER initial_pos;
|
||||
STREAMDATA streamData;
|
||||
DPASTREAMINFO streamInfo;
|
||||
ULONG ulRead;
|
||||
|
@ -101,15 +101,11 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, PFNDPASTREAM loadProc,
|
|||
|
||||
position.QuadPart = 0;
|
||||
|
||||
/*
|
||||
* Zero out our streamData
|
||||
*/
|
||||
memset(&streamData,0,sizeof(STREAMDATA));
|
||||
|
||||
errCode = IStream_Seek (pStream, position, STREAM_SEEK_CUR, &newPosition);
|
||||
errCode = IStream_Seek (pStream, position, STREAM_SEEK_CUR, &initial_pos);
|
||||
if (errCode != S_OK)
|
||||
return errCode;
|
||||
|
||||
memset(&streamData, 0, sizeof(STREAMDATA));
|
||||
errCode = IStream_Read (pStream, &streamData, sizeof(STREAMDATA), &ulRead);
|
||||
if (errCode != S_OK)
|
||||
return errCode;
|
||||
|
@ -118,10 +114,11 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, PFNDPASTREAM loadProc,
|
|||
streamData.dwSize, streamData.dwData2, streamData.dwItems);
|
||||
|
||||
if (ulRead < sizeof(STREAMDATA) ||
|
||||
(DWORD)pData < sizeof(STREAMDATA) ||
|
||||
streamData.dwSize < sizeof(STREAMDATA) ||
|
||||
streamData.dwData2 < 1) {
|
||||
errCode = E_FAIL;
|
||||
streamData.dwSize < sizeof(STREAMDATA) || streamData.dwData2 != 1) {
|
||||
/* back to initial position */
|
||||
position.QuadPart = initial_pos.QuadPart;
|
||||
IStream_Seek (pStream, position, STREAM_SEEK_SET, NULL);
|
||||
return E_FAIL;
|
||||
}
|
||||
|
||||
if (streamData.dwItems > (UINT_MAX / 2 / sizeof(VOID*))) /* 536870911 */
|
||||
|
|
|
@ -586,7 +586,7 @@ static void test_DPA_LoadStream(void)
|
|||
uli.QuadPart = 1;
|
||||
hRes = IStream_Seek(pStm, li, STREAM_SEEK_CUR, &uli);
|
||||
expect(S_OK, hRes);
|
||||
todo_wine ok(uli.QuadPart == 0, "Expected to position reset\n");
|
||||
ok(uli.QuadPart == 0, "Expected to position reset\n");
|
||||
|
||||
/* write valid header for empty DPA */
|
||||
header.dwSize = sizeof(header);
|
||||
|
@ -612,7 +612,7 @@ static void test_DPA_LoadStream(void)
|
|||
expect(S_OK, hRes);
|
||||
|
||||
hRes = pDPA_LoadStream(&dpa, CB_Load, pStm, NULL);
|
||||
todo_wine expect(S_OK, hRes);
|
||||
expect(S_OK, hRes);
|
||||
|
||||
/* try with altered dwData2 field */
|
||||
header.dwSize = sizeof(header);
|
||||
|
@ -632,7 +632,7 @@ static void test_DPA_LoadStream(void)
|
|||
expect(S_OK, hRes);
|
||||
|
||||
hRes = pDPA_LoadStream(&dpa, CB_Load, pStm, (void*)0xdeadbeef);
|
||||
todo_wine expect(E_FAIL, hRes);
|
||||
expect(E_FAIL, hRes);
|
||||
|
||||
ret = IStream_Release(pStm);
|
||||
ok(!ret, "ret=%d\n", ret);
|
||||
|
|
Loading…
Reference in New Issue