[Libva] [PATCH Intel-VA] Avoid NULL ptr deref in i965_decoder_wrapper_picture()

[Xiang, Haihao]

Applied

Thanks
Haihao

> Hi Haihao,
> 
> This patch reviewed by Yakui, same code changed as "[Libva] [PATCH Intel-VA] Add if statement checking for obj_context that possible assign to NULL value."
> I just updated the commit message to proper sentence as what suggest by Emil Velikov.
> Thanks for Yakui to review it.
> 
> ...siewhoon
> 
> > -----Original Message-----
> > From: Libva [mailto:libva-bounces at lists.freedesktop.org] On Behalf Of Lim
> > Siew Hoon
> > Sent: Wednesday, September 30, 2015 7:07 PM
> > To: libva at lists.freedesktop.org
> > Subject: [Libva] [PATCH Intel-VA] Avoid NULL ptr deref in
> > i965_decoder_wrapper_picture()
> > 
> > Signed-off-by: Lim Siew Hoon <siew.hoon.lim at intel.com>
> > Reviewed-by: Zhao Yakui <yakui.zhao at intel.com>
> > ---
> >  src/i965_drv_video.c | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c index
> > 9bbd67f..cb950e1 100644
> > --- a/src/i965_drv_video.c
> > +++ b/src/i965_drv_video.c
> > @@ -2813,6 +2813,9 @@
> > i965_decoder_wrapper_picture(VADriverContextP ctx,
> >      VADriverContextP pdrvctx;
> >      struct object_buffer *obj_buffer;
> > 
> > +    if (obj_context == NULL)
> > +        return VA_STATUS_ERROR_INVALID_CONTEXT;
> > +
> >      /* When it is not wrapped context, continue the normal flowchart */
> >      if (obj_context->wrapper_context == VA_INVALID_ID)
> >          return vaStatus;
> > --
> > 2.1.0
> > 
> > _______________________________________________
> > Libva mailing list
> > Libva at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/libva