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

inetcomm: Rewrite MimeMessage_FindFirst/Next to iterate correctly and avoid invalid pointer conversions.

This commit is contained in:
Alexandre Julliard 2010-04-08 21:15:15 +02:00
parent c1043428ca
commit fc81e45af6
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
dlls/inetcomm/mimeole.c
View File

@ -2002,38 +2002,35 @@ static HRESULT WINAPI MimeMessage_CountBodies(
return S_OK; return S_OK;
} }
static HRESULT find_next(IMimeMessage *msg, LPFINDBODY find_body, HBODY *out) static HRESULT find_next(IMimeMessage *msg, body_t *body, LPFINDBODY find, HBODY *out)
{ {
HRESULT hr; MimeMessage *This = (MimeMessage *)msg;
IMimeBody *mime_body; struct list *ptr;
HBODY next; HBODY next;
if(find_body->dwReserved == 0) for (;;)
find_body->dwReserved = (DWORD)HBODY_ROOT;
else
{ {
hr = IMimeMessage_GetBody(msg, IBL_FIRST, (HBODY)find_body->dwReserved, &next); if (!body) ptr = list_head( &This->body_tree );
if(hr == S_OK)
find_body->dwReserved = (DWORD)next;
else else
{ {
hr = IMimeMessage_GetBody(msg, IBL_NEXT, (HBODY)find_body->dwReserved, &next); ptr = list_head( &body->children );
if(hr == S_OK) while (!ptr)
find_body->dwReserved = (DWORD)next; {
else if (!body->parent) return MIME_E_NOT_FOUND;
return MIME_E_NOT_FOUND; if (!(ptr = list_next( &body->parent->children, &body->entry ))) body = body->parent;
}
}
body = LIST_ENTRY( ptr, body_t, entry );
next = UlongToHandle( body->index );
find->dwReserved = body->index;
if (IMimeBody_IsContentType(body->mime_body, find->pszPriType, find->pszSubType) == S_OK)
{
*out = next;
return S_OK;
} }
} }
return MIME_E_NOT_FOUND;
hr = IMimeMessage_BindToObject(msg, (HBODY)find_body->dwReserved, &IID_IMimeBody, (void**)&mime_body);
if(IMimeBody_IsContentType(mime_body, find_body->pszPriType, find_body->pszSubType) == S_OK)
{
IMimeBody_Release(mime_body);
*out = (HBODY)find_body->dwReserved;
return S_OK;
}
IMimeBody_Release(mime_body);
return find_next(msg, find_body, out);
} }
static HRESULT WINAPI MimeMessage_FindFirst( static HRESULT WINAPI MimeMessage_FindFirst(
@ -2044,7 +2041,7 @@ static HRESULT WINAPI MimeMessage_FindFirst(
TRACE("(%p)->(%p, %p)\n", iface, pFindBody, phBody); TRACE("(%p)->(%p, %p)\n", iface, pFindBody, phBody);
pFindBody->dwReserved = 0; pFindBody->dwReserved = 0;
return find_next(iface, pFindBody, phBody); return find_next( iface, NULL, pFindBody, phBody );
} }
static HRESULT WINAPI MimeMessage_FindNext( static HRESULT WINAPI MimeMessage_FindNext(
@ -2052,9 +2049,15 @@ static HRESULT WINAPI MimeMessage_FindNext(
LPFINDBODY pFindBody, LPFINDBODY pFindBody,
LPHBODY phBody) LPHBODY phBody)
{ {
MimeMessage *This = (MimeMessage *)iface;
body_t *body;
HRESULT hr;
TRACE("(%p)->(%p, %p)\n", iface, pFindBody, phBody); TRACE("(%p)->(%p, %p)\n", iface, pFindBody, phBody);
return find_next(iface, pFindBody, phBody); hr = find_body( &This->body_tree, UlongToHandle( pFindBody->dwReserved ), &body );
if (hr != S_OK) return MIME_E_NOT_FOUND;
return find_next( iface, body, pFindBody, phBody );
} }
static HRESULT WINAPI MimeMessage_ResolveURL( static HRESULT WINAPI MimeMessage_ResolveURL(