[FFmpeg-devel] [PATCH] avcodec/extract_extradata_bsf: Don't unref uninitialized buffers

James Almer jamrial at gmail.com
Sat Nov 30 15:00:53 EET 2019


On 11/30/2019 6:12 AM, Paul B Mahol wrote:
> On 11/30/19, Andreas Rheinhardt <andreas.rheinhardt at gmail.com> wrote:
>> This happens if allocating extradata fails and s->remove is unset.
>>
>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
>> ---
>>  libavcodec/extract_extradata_bsf.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/libavcodec/extract_extradata_bsf.c
>> b/libavcodec/extract_extradata_bsf.c
>> index ff111de48c..15ffed6ba0 100644
>> --- a/libavcodec/extract_extradata_bsf.c
>> +++ b/libavcodec/extract_extradata_bsf.c
>> @@ -85,7 +85,7 @@ static int extract_extradata_av1(AVBSFContext *ctx,
>> AVPacket *pkt,
>>      }
>>
>>      if (extradata_size && has_seq) {
>> -        AVBufferRef *filtered_buf;
>> +        AVBufferRef *filtered_buf = NULL;
>>          uint8_t *extradata, *filtered_data;
>>
>>          if (s->remove) {
>> @@ -179,7 +179,7 @@ static int extract_extradata_h2645(AVBSFContext *ctx,
>> AVPacket *pkt,
>>      if (extradata_size &&
>>          ((ctx->par_in->codec_id == AV_CODEC_ID_HEVC && has_sps && has_vps)
>> ||
>>           (ctx->par_in->codec_id == AV_CODEC_ID_H264 && has_sps))) {
>> -        AVBufferRef *filtered_buf;
>> +        AVBufferRef *filtered_buf = NULL;
>>          uint8_t *extradata, *filtered_data;
>>
>>          if (s->remove) {
>> --
>> 2.21.0
>>
> 
> LGTM

Applied.


More information about the ffmpeg-devel mailing list