shell32: Fix possible dereference of NULL ptr.

f16e2c3a · Jeff Latimer · Alexandre Julliard · 0678f6d1 · f16e2c3a
Commit f16e2c3a authored Jun 10, 2007 by Jeff Latimer Committed by Alexandre Julliard Jun 11, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

shelllink.c dlls/shell32/shelllink.c +6 -2

No files found.
--- a/dlls/shell32/shelllink.c
+++ b/dlls/shell32/shelllink.c
@@ -584,8 +584,12 @@ static HRESULT Stream_LoadString( IStream* stm, BOOL unicode, LPWSTR *pstr )
    {
        count = MultiByteToWideChar( CP_ACP, 0, (LPSTR) temp, len, NULL, 0 );
        str = HeapAlloc( GetProcessHeap(), 0, (count+1)*sizeof (WCHAR) );
-        if( str )
-            MultiByteToWideChar( CP_ACP, 0, (LPSTR) temp, len, str, count );
+        if( !str )
+        {
+            HeapFree( GetProcessHeap(), 0, temp );
+            return E_OUTOFMEMORY;
+        }
+        MultiByteToWideChar( CP_ACP, 0, (LPSTR) temp, len, str, count );
        HeapFree( GetProcessHeap(), 0, temp );
    }
    else