From: Grigori Goronzy <greg@chown.ath.cx>
Date: Sun, 2 Mar 2014 11:57:03 +0000 (+0100)
Subject: st/vdpau: fix possible NULL dereference
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=86c06871a282ec60e81d0cbabc3b1d661bc33c75;p=mesa.git

st/vdpau: fix possible NULL dereference

Reviewed-by: Christian König <christian.koenig@amd.com>
---

diff --git a/src/gallium/state_trackers/vdpau/mixer.c b/src/gallium/state_trackers/vdpau/mixer.c
index 996fd8e1602..e6bfb8cbc43 100644
--- a/src/gallium/state_trackers/vdpau/mixer.c
+++ b/src/gallium/state_trackers/vdpau/mixer.c
@@ -242,16 +242,16 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer,
    compositor = &vmixer->device->compositor;
 
    surf = vlGetDataHTAB(video_surface_current);
-   video_buffer = surf->video_buffer;
    if (!surf)
       return VDP_STATUS_INVALID_HANDLE;
+   video_buffer = surf->video_buffer;
 
    if (surf->device != vmixer->device)
       return VDP_STATUS_HANDLE_DEVICE_MISMATCH;
 
-   if (vmixer->video_width > surf->video_buffer->width ||
-       vmixer->video_height > surf->video_buffer->height ||
-       vmixer->chroma_format != surf->video_buffer->chroma_format)
+   if (vmixer->video_width > video_buffer->width ||
+       vmixer->video_height > video_buffer->height ||
+       vmixer->chroma_format != video_buffer->chroma_format)
       return VDP_STATUS_INVALID_SIZE;
 
    if (layer_count > vmixer->max_layers)