Re: [Mesa-dev] [PATCH 1/2] st/vdpau: fix possible NULL dereference
Both patches reviewed and pushed. Thanks, Christian. Am 02.03.2014 12:57, schrieb Grigori Goronzy: --- 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) ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 1/2] st/vdpau: fix possible NULL dereference
--- 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) -- 1.8.3.2 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
