dwrite: Fix possible NULL pointer access in heap_strdup*.

7e2cac26 · André Hentschel · Alexandre Julliard · bafe54e7 · 7e2cac26
Commit 7e2cac26 authored Nov 17, 2012 by André Hentschel Committed by Alexandre Julliard Nov 19, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

dwrite_private.h dlls/dwrite/dwrite_private.h +7 -3

No files found.
--- a/dlls/dwrite/dwrite_private.h
+++ b/dlls/dwrite/dwrite_private.h
@@ -47,7 +47,8 @@ static inline LPWSTR heap_strdupW(const WCHAR *str)

        size = (strlenW(str)+1)*sizeof(WCHAR);
        ret = heap_alloc(size);
-        memcpy(ret, str, size);
+        if(ret)
+            memcpy(ret, str, size);
    }

    return ret;
@@ -60,8 +61,11 @@ static inline LPWSTR heap_strdupnW(const WCHAR *str, UINT32 len)
    if (len)
    {
        ret = heap_alloc((len+1)*sizeof(WCHAR));
-        memcpy(ret, str, len*sizeof(WCHAR));
-        ret[len] = 0;
+        if(ret)
+        {
+            memcpy(ret, str, len*sizeof(WCHAR));
+            ret[len] = 0;
+        }
    }

    return ret;