From 7a595a578e214230f739fa772ad99d9951f05ff0 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Fri, 22 May 2020 17:59:27 -0700 Subject: [PATCH] vdpau: Fix wrong calloc sizeof argument. Fix warning reported by Coverity Scan. Wrong sizeof argument (SIZEOF_MISMATCH) suspicious_sizeof: Passing argument 3544UL (sizeof (vlVdpPresentationQueue)) to function calloc that returns a pointer of type vlVdpPresentationQueueTarget * is suspicious because a multiple of sizeof (vlVdpPresentationQueueTarget) /*16*/ is expected. Fixes: 65fe0866aec7 ("vl: implemented a few functions and made stubs to get mplayer running") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3026 Signed-off-by: Vinson Lee Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: (cherry picked from commit 8b353524b04fa9cd77e21e2d036c69f1cff30c35) --- .pick_status.json | 2 +- src/gallium/state_trackers/vdpau/device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index cf1b1607cca..557816f2d13 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1543,7 +1543,7 @@ "description": "vdpau: Fix wrong calloc sizeof argument.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "65fe0866aec7b5608419f6d184cb1fa4fe1dc45a" }, diff --git a/src/gallium/state_trackers/vdpau/device.c b/src/gallium/state_trackers/vdpau/device.c index 5df30ea3c08..f69c54c4536 100644 --- a/src/gallium/state_trackers/vdpau/device.c +++ b/src/gallium/state_trackers/vdpau/device.c @@ -170,7 +170,7 @@ vlVdpPresentationQueueTargetCreateX11(VdpDevice device, Drawable drawable, if (!dev) return VDP_STATUS_INVALID_HANDLE; - pqt = CALLOC(1, sizeof(vlVdpPresentationQueue)); + pqt = CALLOC(1, sizeof(vlVdpPresentationQueueTarget)); if (!pqt) return VDP_STATUS_RESOURCES;