Module: Mesa
Branch: master
Commit: 6c9a352d79e215b545b5d400ae946a27d56e4abd
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6c9a352d79e215b545b5d400ae946a27d56e4abd
Author: Nayan Deshmukh <nayan26deshm...@gmail.com>
Date: Thu Jun 2 12:29:58 2016 +0530
st/vdpau: check for null pointer in get/put bits.
Check for null pointer before accessing arrays in get/put bits
native/YCbCr/Indexed in VdpOutputSurface and VdpVideoSurface.
Signed-off-by: Nayan Deshmukh <nayan26deshm...@gmail.com>
Reviewed-by: Christian König <christian.koe...@amd.com>
---
src/gallium/state_trackers/vdpau/output.c | 6 ++++++
src/gallium/state_trackers/vdpau/surface.c | 6 ++++++
2 files changed, 12 insertions(+)
diff --git a/src/gallium/state_trackers/vdpau/output.c
b/src/gallium/state_trackers/vdpau/output.c
index c644cc8..2192f71 100644
--- a/src/gallium/state_trackers/vdpau/output.c
+++ b/src/gallium/state_trackers/vdpau/output.c
@@ -205,6 +205,9 @@ vlVdpOutputSurfaceGetBitsNative(VdpOutputSurface surface,
if (!pipe)
return VDP_STATUS_INVALID_HANDLE;
+ if (!destination_data || !destination_pitches)
+ return VDP_STATUS_INVALID_POINTER;
+
pipe_mutex_lock(vlsurface->device->mutex);
vlVdpResolveDelayedRendering(vlsurface->device, NULL, NULL);
@@ -247,6 +250,9 @@ vlVdpOutputSurfacePutBitsNative(VdpOutputSurface surface,
if (!pipe)
return VDP_STATUS_INVALID_HANDLE;
+ if (!source_data || !source_pitches)
+ return VDP_STATUS_INVALID_POINTER;
+
pipe_mutex_lock(vlsurface->device->mutex);
vlVdpResolveDelayedRendering(vlsurface->device, NULL, NULL);
diff --git a/src/gallium/state_trackers/vdpau/surface.c
b/src/gallium/state_trackers/vdpau/surface.c
index d418d56..7998527 100644
--- a/src/gallium/state_trackers/vdpau/surface.c
+++ b/src/gallium/state_trackers/vdpau/surface.c
@@ -215,6 +215,9 @@ vlVdpVideoSurfaceGetBitsYCbCr(VdpVideoSurface surface,
if (!pipe)
return VDP_STATUS_INVALID_HANDLE;
+ if (!destination_data || !destination_pitches)
+ return VDP_STATUS_INVALID_POINTER;
+
format = FormatYCBCRToPipe(destination_ycbcr_format);
if (format == PIPE_FORMAT_NONE)
return VDP_STATUS_INVALID_Y_CB_CR_FORMAT;
@@ -313,6 +316,9 @@ vlVdpVideoSurfacePutBitsYCbCr(VdpVideoSurface surface,
if (!pipe)
return VDP_STATUS_INVALID_HANDLE;
+ if (!source_data || !source_pitches)
+ return VDP_STATUS_INVALID_POINTER;
+
pipe_mutex_lock(p_surf->device->mutex);
if (p_surf->video_buffer == NULL || pformat !=
p_surf->video_buffer->buffer_format) {
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
