[ros-diffs] [pschweitzer] 54612: [USP10] Fix memory leaks. Already sent & committed upstream: http://source.winehq.org/git/wine.git/commit/783683be2decd90079e484e6d12eee958da29754

Author: pschweitzer
Date: Thu Dec  8 18:10:36 2011
New Revision: 54612

URL: http://svn.reactos.org/svn/reactos?rev=54612&view=rev
Log:
[USP10]
Fix memory leaks.
Already sent & committed upstream:
http://source.winehq.org/git/wine.git/commit/783683be2decd90079e484e6d12eee…

Modified:
    trunk/reactos/dll/win32/usp10/usp10.c

Modified: trunk/reactos/dll/win32/usp10/usp10.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re…
==============================================================================
--- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Thu Dec  8 18:10:36 2011
@@ -1439,7 +1439,10 @@
     {
         int tab_x = 0;
         if (!(analysis->glyphs = heap_alloc_zero(sizeof(StringGlyphs) *
analysis->numItems)))
+        {
+            heap_free(BidiLevel);
             goto error;
+        }
 
         for (i = 0; i < analysis->numItems; i++)
         {
@@ -2422,8 +2425,16 @@
             if (!(pwOutGlyphs[i] = get_cache_glyph(psc, chInput)))
             {
                 WORD glyph;
-                if (!hdc) return E_PENDING;
-                if (GetGlyphIndicesW(hdc, &chInput, 1, &glyph, 0) == GDI_ERROR)
return S_FALSE;
+                if (!hdc)
+                {
+                    heap_free(rChars);
+                    return E_PENDING;
+                }
+                if (GetGlyphIndicesW(hdc, &chInput, 1, &glyph, 0) == GDI_ERROR)
+                {
+                    heap_free(rChars);
+                    return S_FALSE;
+                }
                 pwOutGlyphs[i] = set_cache_glyph(psc, chInput, glyph);
             }
             rChars[i] = chInput;
@@ -2487,7 +2498,11 @@
     charProps = heap_alloc_zero(sizeof(SCRIPT_CHARPROP)*cChars);
     if (!charProps) return E_OUTOFMEMORY;
     glyphProps = heap_alloc_zero(sizeof(SCRIPT_GLYPHPROP)*cMaxGlyphs);
-    if (!glyphProps) return E_OUTOFMEMORY;
+    if (!glyphProps)
+    {
+        heap_free(charProps);
+        return E_OUTOFMEMORY;
+    }
 
     hr = ScriptShapeOpenType(hdc, psc, psa, scriptInformation[psa->eScript].scriptTag,
0, NULL, NULL, 0, pwcChars, cChars, cMaxGlyphs, pwLogClust, charProps, pwOutGlyphs,
glyphProps, pcGlyphs);