diff options
| author | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2017-08-08 13:46:56 +0200 |
|---|---|---|
| committer | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2017-08-08 13:46:56 +0200 |
| commit | 9eddf6c00458f9d611a4a3f5b343ec294538ae6b (patch) | |
| tree | 22c292fc94f7bdab9b8e9d3d8c4c772ab0d50a51 | |
| parent | 3bb96eff14a3320f58392fe7129f946840939735 (diff) | |
libs: decoder: h264: remove unrequired NULL check
Coverity scan bug:
Dereference after null check: Either the check against null is
unnecessary, or there may be a null pointer dereference.
In the original commit for fill_picture_gaps() (commit 5abd2b90) the
prev_picture could be NULL, that's why the code did a null check. But,
since commit 52adebe7, the previous reference frames are tracked, thus
there is no need to check null anymore.
| -rw-r--r-- | gst-libs/gst/vaapi/gstvaapidecoder_h264.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_h264.c b/gst-libs/gst/vaapi/gstvaapidecoder_h264.c index c7885e4b..5f982a0c 100644 --- a/gst-libs/gst/vaapi/gstvaapidecoder_h264.c +++ b/gst-libs/gst/vaapi/gstvaapidecoder_h264.c @@ -3252,7 +3252,7 @@ fill_picture_gaps (GstVaapiDecoderH264 * decoder, GstVaapiPictureH264 * picture, return TRUE; prev_frame = priv->prev_ref_frames[picture->base.voc]; - g_assert (prev_frame != NULL); + g_assert (prev_frame != NULL && prev_frame->buffers[0] != NULL); prev_picture = gst_vaapi_picture_ref (prev_frame->buffers[0]); gst_vaapi_picture_ref (picture); @@ -3286,10 +3286,7 @@ fill_picture_gaps (GstVaapiDecoderH264 * decoder, GstVaapiPictureH264 * picture, break; /* Create new picture */ - if (prev_picture) - lost_picture = gst_vaapi_picture_h264_new_clone (prev_picture); - else - lost_picture = gst_vaapi_picture_h264_new (decoder); + lost_picture = gst_vaapi_picture_h264_new_clone (prev_picture); if (!lost_picture) goto error_allocate_picture; |