d3dx9_36: Avoid dereferencing null pointers in trace (spotted by Paul Vriens).

This commit is contained in:
Christian Costa 2010-03-04 08:20:44 +01:00 committed by Alexandre Julliard
parent 78f9177d9d
commit 6dfe16fc48
1 changed files with 5 additions and 3 deletions

View File

@ -154,11 +154,13 @@ HRESULT WINAPI D3DXFindShaderComment(CONST DWORD* byte_code, DWORD fourcc, LPCVO
/* Check if this is the comment we are looking for */ /* Check if this is the comment we are looking for */
if (*(ptr + 1) == fourcc) if (*(ptr + 1) == fourcc)
{ {
UINT ctab_size = (comment_size - 1) * sizeof(DWORD);
LPCVOID ctab_data = ptr + 2;
if (size) if (size)
*size = (comment_size - 1) * sizeof(DWORD); *size = ctab_size;
if (data) if (data)
*data = ptr + 2; *data = ctab_data;
TRACE("Returning comment data at %p with size %d\n", *data, *size); TRACE("Returning comment data at %p with size %d\n", ctab_data, ctab_size);
return D3D_OK; return D3D_OK;
} }
ptr += comment_size; ptr += comment_size;