quartz: Always allocate the entire VIDEOINFO structure.

Signed-off-by: Eric Pouech <eric.pouech@gmail.com> Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

quartz: Always allocate the entire VIDEOINFO structure.
e102068c · Eric Pouech · Alexandre Julliard · 30ab3557 · e102068c
Commit e102068c authored Feb 17, 2022 by Eric Pouech Committed by Alexandre Julliard Feb 17, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

avidec.c dlls/quartz/avidec.c +5 -2

No files found.
--- a/dlls/quartz/avidec.c
+++ b/dlls/quartz/avidec.c
@@ -342,9 +342,12 @@ static HRESULT avi_decompressor_source_get_media_type(struct strmbase_pin *iface

    if (index < ARRAY_SIZE(formats))
    {
-        if (!(format = CoTaskMemAlloc(offsetof(VIDEOINFO, dwBitMasks[3]))))
+        /* In theory we could allocate less than this, but gcc generates
+         * -Warray-bounds warnings if we access the structure through a
+         * VIDEOINFO pointer, even if we only access valid fields. */
+        if (!(format = CoTaskMemAlloc(sizeof(*format))))
            return E_OUTOFMEMORY;
-        memset(format, 0, offsetof(VIDEOINFO, dwBitMasks[3]));
+        memset(format, 0, sizeof(*format));

        format->rcSource = sink_format->rcSource;
        format->rcTarget = sink_format->rcTarget;