gdiplus: Avoid uninitialized usage of bitmap (Coverity).

5ae8629f · Marcus Meissner · Alexandre Julliard · fcc3a77a · 5ae8629f
Commit 5ae8629f authored Sep 03, 2012 by Marcus Meissner Committed by Alexandre Julliard Sep 03, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 10 deletions

image.c dlls/gdiplus/image.c +12 -10

No files found.
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -3124,17 +3124,19 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_fr
            IWICBitmapSource_Release(source);
        }

-        bitmap->metadata_reader = NULL;
-        if (IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void **)&block_reader) == S_OK)
-        {
-            UINT block_count = 0;
-            if (IWICMetadataBlockReader_GetCount(block_reader, &block_count) == S_OK && block_count)
-                IWICMetadataBlockReader_GetReaderByIndex(block_reader, 0, &bitmap->metadata_reader);
-            IWICMetadataBlockReader_Release(block_reader);
-        }
+        if (SUCCEEDED(hr)) {
+            bitmap->metadata_reader = NULL;
+            if (IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void **)&block_reader) == S_OK)
+            {
+                UINT block_count = 0;
+                if (IWICMetadataBlockReader_GetCount(block_reader, &block_count) == S_OK && block_count)
+                    IWICMetadataBlockReader_GetReaderByIndex(block_reader, 0, &bitmap->metadata_reader);
+                IWICMetadataBlockReader_Release(block_reader);
+            }

-        palette = get_palette(frame, palette_type);
-        IWICBitmapFrameDecode_Release(frame);
+            palette = get_palette(frame, palette_type);
+            IWICBitmapFrameDecode_Release(frame);
+        }
    }

    IWICBitmapDecoder_Release(decoder);