oleaut32/safearray: Fix allocation error check for array descriptor.

90090332 · Nikolay Sivov · Alexandre Julliard · 30063b54 · 90090332
Commit 90090332 authored Jan 14, 2011 by Nikolay Sivov Committed by Alexandre Julliard Jan 17, 2011
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

safearray.c dlls/oleaut32/safearray.c +6 -2

No files found.
--- a/dlls/oleaut32/safearray.c
+++ b/dlls/oleaut32/safearray.c
@@ -172,11 +172,15 @@ static ULONG SAFEARRAY_GetCellCount(const SAFEARRAY *psa)
 /* Allocate a descriptor for an array */
 static HRESULT SAFEARRAY_AllocDescriptor(ULONG ulSize, SAFEARRAY **ppsaOut)
 {
-  *ppsaOut = (SAFEARRAY*)((char*)SAFEARRAY_Malloc(ulSize + SAFEARRAY_HIDDEN_SIZE) + SAFEARRAY_HIDDEN_SIZE);
+  char *ptr = SAFEARRAY_Malloc(ulSize + SAFEARRAY_HIDDEN_SIZE);

-  if (!*ppsaOut)
+  if (!ptr)
+  {
+      *ppsaOut = NULL;
      return E_UNEXPECTED;
+  }

+  *ppsaOut = (SAFEARRAY*)(ptr + SAFEARRAY_HIDDEN_SIZE);
  return S_OK;
 }