From 4bb41e6ca3973176046f92d7dcd7a4f63f08dd1c Mon Sep 17 00:00:00 2001 From: Víctor Manuel Jáquez Leal Date: Tue, 17 Dec 2019 17:09:37 +0100 Subject: libs: encoder: h264fei: remove unnecessary check Issue detected by Coverity `info_to_pack.h264_slice_header` is always allocated by gst_vaapi_feipak_h264_encode(), thus checking it to free it afterwards in doesn't make much sense. But it requires to be free on the error path. There may be a null pointer dereference, or else the comparison against null is unnecessary. In gst_vaapi_encoder_h264_fei_encode: All paths that lead to this null pointer comparison already dereference the pointer earlier --- gst-libs/gst/vaapi/gstvaapiencoder_h264_fei.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gst-libs/gst/vaapi/gstvaapiencoder_h264_fei.c b/gst-libs/gst/vaapi/gstvaapiencoder_h264_fei.c index d643a6a6..eeec20aa 100644 --- a/gst-libs/gst/vaapi/gstvaapiencoder_h264_fei.c +++ b/gst-libs/gst/vaapi/gstvaapiencoder_h264_fei.c @@ -2823,8 +2823,7 @@ gst_vaapi_encoder_h264_fei_encode (GstVaapiEncoder * base_encoder, } /* Free the slice array */ - if (info_to_pak.h264_slice_headers) - g_array_free (info_to_pak.h264_slice_headers, TRUE); + g_array_free (info_to_pak.h264_slice_headers, TRUE); gst_vaapi_enc_picture_unref (picture2); } else { @@ -2841,6 +2840,8 @@ error: reconstruct); if (picture2) gst_vaapi_enc_picture_unref (picture2); + if (info_to_pak.h264_slice_headers) + g_array_free (info_to_pak.h264_slice_headers, TRUE); return status; } } -- cgit v1.2.3