oleaut32: Always free TLIBATTR in LoadRegTypeLib() (Valgrind).

0c0fe4ef · Nikolay Sivov · Alexandre Julliard · 3b16986a · 0c0fe4ef
Commit 0c0fe4ef authored Apr 26, 2014 by Nikolay Sivov Committed by Alexandre Julliard Apr 28, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

typelib.c dlls/oleaut32/typelib.c +9 -4

No files found.
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -542,12 +542,17 @@ HRESULT WINAPI LoadRegTypeLib(
            TLIBATTR *attr;

            res = ITypeLib_GetLibAttr(*ppTLib, &attr);
-            if (res == S_OK && (attr->wMajorVerNum != wVerMajor || attr->wMinorVerNum < wVerMinor))
+            if (res == S_OK)
            {
+                BOOL mismatch = attr->wMajorVerNum != wVerMajor || attr->wMinorVerNum < wVerMinor;
                ITypeLib_ReleaseTLibAttr(*ppTLib, attr);
-                ITypeLib_Release(*ppTLib);
-                *ppTLib = NULL;
-                res = TYPE_E_LIBNOTREGISTERED;
+
+                if (mismatch)
+                {
+                    ITypeLib_Release(*ppTLib);
+                    *ppTLib = NULL;
+                    res = TYPE_E_LIBNOTREGISTERED;
+                }
            }
        }
    }