gdiplus: Get rid of gcc11 warnings (-Warray-bounds).

Signed-off-by: Eric Pouech <eric.pouech@gmail.com> Signed-off-by: Esme Povirk <esme@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdiplus: Get rid of gcc11 warnings (-Warray-bounds).
af403bd3 · Eric Pouech · Alexandre Julliard · aa9d1bd1 · af403bd3
Commit af403bd3 authored Feb 14, 2022 by Eric Pouech Committed by Alexandre Julliard Feb 16, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

image.c dlls/gdiplus/image.c +4 -1

No files found.
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -4107,6 +4107,8 @@ static GpStatus decode_image_tiff(IStream* stream, GpImage **image)
    return decode_image_wic(stream, &GUID_ContainerFormatTiff, NULL, image);
 }

+C_ASSERT(offsetof(WmfPlaceableFileHeader, Key) == 0);
+
 static GpStatus load_wmf(IStream *stream, GpMetafile **metafile)
 {
    WmfPlaceableFileHeader pfh;
@@ -4123,7 +4125,8 @@ static GpStatus load_wmf(IStream *stream, GpMetafile **metafile)
    if (hr != S_OK || size != sizeof(mh))
        return GenericError;

-    if (((WmfPlaceableFileHeader *)&mh)->Key == WMF_PLACEABLE_KEY)
+    /* detect whether stream starts with a WmfPlaceablefileheader */
+    if (*(UINT32 *)&mh == WMF_PLACEABLE_KEY)
    {
        seek.QuadPart = 0;
        hr = IStream_Seek(stream, seek, STREAM_SEEK_SET, NULL);