Module: Mesa
Branch: master
Commit: 9a73f5728e9b834c51128e34317854702281bf3e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a73f5728e9b834c51128e34317854702281bf3e
Author: Thomas Hindoe Paaboel Andersen <pho...@gmail.com>
Date: Wed Mar 30 08:13:24 2016 +0200
st/vdpau: correct null check
The null check of result was the wrong way around. Also, move memset
and dereference of result after the null check.
Reviewed-by: Christian König <christian.koe...@amd.com>
---
src/gallium/state_trackers/vdpau/surface.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/gallium/state_trackers/vdpau/surface.c
b/src/gallium/state_trackers/vdpau/surface.c
index 0550141..d418d56 100644
--- a/src/gallium/state_trackers/vdpau/surface.c
+++ b/src/gallium/state_trackers/vdpau/surface.c
@@ -426,18 +426,18 @@ VdpStatus vlVdpVideoSurfaceDMABuf(VdpVideoSurface surface,
struct pipe_surface *surf;
- memset(result, 0, sizeof(*result));
- result->handle = -1;
-
if (!p_surf)
return VDP_STATUS_INVALID_HANDLE;
if (plane > 3)
return VDP_STATUS_INVALID_VALUE;
- if (result)
+ if (!result)
return VDP_STATUS_INVALID_POINTER;
+ memset(result, 0, sizeof(*result));
+ result->handle = -1;
+
pipe_mutex_lock(p_surf->device->mutex);
if (p_surf->video_buffer == NULL) {
struct pipe_context *pipe = p_surf->device->context;
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
