windowscodecs: Fix a memory leak.

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Vincent Povirk <vincent@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

windowscodecs: Fix a memory leak.
2eeef78e · Dmitry Timoshkov · Alexandre Julliard · 97546cfb · 2eeef78e
Commit 2eeef78e authored Jun 29, 2017 by Dmitry Timoshkov Committed by Alexandre Julliard Jun 29, 2017
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

metadataquery.c dlls/windowscodecs/metadataquery.c +7 -3

No files found.
--- a/dlls/windowscodecs/metadataquery.c
+++ b/dlls/windowscodecs/metadataquery.c
@@ -212,7 +212,7 @@ static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *sc
        hr = get_token(&next_elem, id, schema, idx);
        if (hr != S_OK)
        {
-            TRACE("parse_elem error %#x\n", hr);
+            TRACE("get_token error %#x\n", hr);
            return hr;
        }
        elem->len = (end - start) + next_elem.len;
@@ -248,7 +248,7 @@ static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *sc
            if (*end == '\\') end++;
            *bstr++ = *end++;
        }
-        if (!*end || *end != '}')
+        if (*end != '}')
        {
            PropVariantClear(&next_token);
            return WINCODEC_ERR_INVALIDQUERYREQUEST;
@@ -260,7 +260,11 @@ static HRESULT get_token(struct string_t *elem, PROPVARIANT *id, PROPVARIANT *sc
        {
            id->vt = VT_CLSID;
            id->u.puuid = CoTaskMemAlloc(sizeof(GUID));
-            if (!id->u.puuid) return E_OUTOFMEMORY;
+            if (!id->u.puuid)
+            {
+                PropVariantClear(&next_token);
+                return E_OUTOFMEMORY;
+            }

            hr = UuidFromStringW(next_token.u.bstrVal, id->u.puuid);
        }