summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVíctor Manuel Jáquez Leal <vjaquez@igalia.com>2017-08-08 15:49:27 +0200
committerVíctor Manuel Jáquez Leal <vjaquez@igalia.com>2017-08-08 16:15:45 +0200
commit067968ae74f321ae9927d43af8b9deab923d17ca (patch)
tree22744d2bd0cf70559fc09eec8bda9da8b0712139
parentd879664a0ad55a65f8604be3a44375bc1117633b (diff)
libs: decoder: h265: check for null
Coverity scan bug: Dereference after null check: Either the check against null is unnecessary, or there may be a null pointer dereference. While looking for hte lowest poc, according to rest of the code, the picture in the dbp (decoded picture buffer) might be NULL, thus we could check for a NULL picture before assigned as found. Also, split a comma operator because it is considered as a bad practice because it possible side effects.
-rw-r--r--gst-libs/gst/vaapi/gstvaapidecoder_h265.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_h265.c b/gst-libs/gst/vaapi/gstvaapidecoder_h265.c
index 3da14e6b..a1c856d3 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_h265.c
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_h265.c
@@ -717,8 +717,10 @@ dpb_find_lowest_poc (GstVaapiDecoderH265 * decoder,
GstVaapiPictureH265 *const picture = priv->dpb[i]->buffer;
if (picture && !picture->output_needed)
continue;
- if (!found_picture || found_picture->poc > picture->poc)
- found_picture = picture, found_index = i;
+ if (picture && (!found_picture || found_picture->poc > picture->poc)) {
+ found_picture = picture;
+ found_index = i;
+ }
}
if (found_picture_ptr)