usp10: Use heap_calloc() in ScriptShape().

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Aric Stewart <aric@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

usp10: Use heap_calloc() in ScriptShape().
315be161 · Henri Verbeet · Alexandre Julliard · 798439ba · 315be161
Commit 315be161 authored Mar 06, 2018 by Henri Verbeet Committed by Alexandre Julliard Mar 06, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

usp10.c dlls/usp10/usp10.c +4 -4

No files found.
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -3333,10 +3333,10 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars,
    if (!psva || !pcGlyphs) return E_INVALIDARG;
    if (cChars > cMaxGlyphs) return E_OUTOFMEMORY;

-    charProps = heap_alloc_zero(sizeof(SCRIPT_CHARPROP)*cChars);
-    if (!charProps) return E_OUTOFMEMORY;
-    glyphProps = heap_alloc_zero(sizeof(SCRIPT_GLYPHPROP)*cMaxGlyphs);
-    if (!glyphProps)
+    if (!(charProps = heap_calloc(cChars, sizeof(*charProps))))
+        return E_OUTOFMEMORY;
+
+    if (!(glyphProps = heap_calloc(cMaxGlyphs, sizeof(*glyphProps))))
    {
        heap_free(charProps);
        return E_OUTOFMEMORY;