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

ole32: Only read known format ids when attempting to read summary information.

This commit is contained in:
Juan Lang 2010-05-24 12:11:22 -07:00 committed by Alexandre Julliard
parent b4c3a04165
commit c94b2687d2
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/ole32/stg_prop.c
View File

@ -1314,6 +1314,13 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This)
hr = PropertyStorage_ReadFmtIdOffsetFromStream(This->stm, &fmtOffset); hr = PropertyStorage_ReadFmtIdOffsetFromStream(This->stm, &fmtOffset);
if (FAILED(hr)) if (FAILED(hr))
goto end; goto end;
if (!IsEqualGUID(&fmtOffset.fmtid, &FMTID_DocSummaryInformation) &&
!IsEqualGUID(&fmtOffset.fmtid, &FMTID_SummaryInformation))
{
WARN("not reading unknown fmtid %s\n", debugstr_guid(&fmtOffset.fmtid));
hr = S_FALSE;
goto end;
}
if (fmtOffset.dwOffset > stat.cbSize.u.LowPart) if (fmtOffset.dwOffset > stat.cbSize.u.LowPart)
{ {
WARN("invalid offset %d (stream length is %d)\n", fmtOffset.dwOffset, WARN("invalid offset %d (stream length is %d)\n", fmtOffset.dwOffset,

1
dlls/ole32/tests/stg_prop.c
View File

@ -333,7 +333,6 @@ static void testProps(void)
hr = IPropertySetStorage_Open(propSetStorage, &anyOldGuid, hr = IPropertySetStorage_Open(propSetStorage, &anyOldGuid,
STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &propertyStorage); STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &propertyStorage);
todo_wine
ok(hr == S_OK, "IPropertySetStorage_Open failed: 0x%08x\n", hr); ok(hr == S_OK, "IPropertySetStorage_Open failed: 0x%08x\n", hr);
spec.ulKind = PRSPEC_PROPID; spec.ulKind = PRSPEC_PROPID;