Mesa (master): st/vdpau: fix possible NULL dereference

[Christian König]

Module: Mesa
Branch: master
Commit: 86c06871a282ec60e81d0cbabc3b1d661bc33c75
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=86c06871a282ec60e81d0cbabc3b1d661bc33c75

Author: Grigori Goronzy <greg at chown.ath.cx>
Date:   Sun Mar  2 12:57:03 2014 +0100

st/vdpau: fix possible NULL dereference

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

---

 src/gallium/state_trackers/vdpau/mixer.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/state_trackers/vdpau/mixer.c b/src/gallium/state_trackers/vdpau/mixer.c
index 996fd8e..e6bfb8c 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)