[PATCH 5/5] usp10: Use heap_calloc() in ScriptTextOut().

[Henri Verbeet]

Signed-off-by: Henri Verbeet 
---
 dlls/usp10/usp10.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
index 4daba34..35533a5 100644
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -3609,14 +3609,13 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN
     if  (!psa->fNoGlyphIndex)                                     /* Have Glyphs?                      */
         fuOptions |= ETO_GLYPH_INDEX;                             /* Say don't do translation to glyph */

-    lpDx = heap_alloc(cGlyphs * sizeof(INT) * 2);
-    if (!lpDx) return E_OUTOFMEMORY;
+    if (!(lpDx = heap_calloc(cGlyphs, 2 * sizeof(*lpDx))))
+        return E_OUTOFMEMORY;
     fuOptions |= ETO_PDY;

if (psa->fRTL && psa->fLogicalOrder)
     {
-        reordered_glyphs = heap_alloc( cGlyphs * sizeof(WORD) );
-        if (!reordered_glyphs)
+        if (!(reordered_glyphs = heap_calloc(cGlyphs, sizeof(*reordered_glyphs))))
         {
             heap_free( lpDx );
             return E_OUTOFMEMORY;

[Aric Stewart]

Signed-off-by: Aric Stewart

On 3/2/18 2:40 AM, Henri Verbeet wrote:
> Signed-off-by: Henri Verbeet
>
> dlls/usp10/usp10.c | 7 +++----
>   1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
> index 4daba34..35533a5 100644
> --- a/dlls/usp10/usp10.c
> +++ b/dlls/usp10/usp10.c
> @@ -3609,14 +3609,13 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN
>       if  (!psa->fNoGlyphIndex)                                     /* Have Glyphs?                      */
>           fuOptions |= ETO_GLYPH_INDEX;                             /* Say don't do translation to glyph */
> - lpDx = heap_alloc(cGlyphs * sizeof(INT) * 2);
> - if (!lpDx) return E_OUTOFMEMORY;
> -
>
> if (!(lpDx = heap_calloc(cGlyphs, 2 * sizeof(*lpDx))))
> -
>    return E_OUTOFMEMORY;
> fuOptions |= ETO_PDY;
>
> if (psa->fRTL && psa->fLogicalOrder)
> {
> -
>    reordered_glyphs = heap_alloc( cGlyphs * sizeof(WORD) );
> -
>    if (!reordered_glyphs)
> -
>    if (!(reordered_glyphs = heap_calloc(cGlyphs, sizeof(*reordered_glyphs))))
>     {
>         heap_free( lpDx );
>         return E_OUTOFMEMORY;