[Mesa-dev] [PATCH] st/vdpau: check for null pointer in get/put bits.

[Christian König]

Am 02.06.2016 um 08:41 schrieb Nayan Deshmukh:
> Check for null pointer before accessing arrays in get/put bits
> native/YCbCr/Indexed in VdpOutputSurface and VdpVideoSurface.
>
> Signed-off-by: Nayan Deshmukh <nayan26deshmukh at gmail.com>

Reviewed and pushed.

Thanks for the help,
Christian.

> ---
>   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) {
>