[FFmpeg-devel] [PATCH 1/2] avformat/hls: check return value of new_init_section()

Marton Balint cus at passwd.hu
Sat Apr 10 16:07:53 EEST 2021



On Sat, 10 Apr 2021, Andreas Rheinhardt wrote:

> Marton Balint:
>> Fixes part of ticket #8931.
>> 
>> Signed-off-by: Marton Balint <cus at passwd.hu>
>> ---
>>  libavformat/hls.c | 4 ++++
>>  1 file changed, 4 insertions(+)
>> 
>> diff --git a/libavformat/hls.c b/libavformat/hls.c
>> index 597bea7f25..b589ad2870 100644
>> --- a/libavformat/hls.c
>> +++ b/libavformat/hls.c
>> @@ -842,6 +842,10 @@ static int parse_playlist(HLSContext *c, const char *url,
>>              ff_parse_key_value(ptr, (ff_parse_key_val_cb) handle_init_section_args,
>>                                 &info);
>>              cur_init_section = new_init_section(pls, &info, url);
>> +            if (!cur_init_section) {
>> +                ret = AVERROR(ENOMEM);
>> +                goto fail;
>> +            }
>>              cur_init_section->key_type = key_type;
>>              if (has_iv) {
>>                  memcpy(cur_init_section->iv, iv, sizeof(iv));
>> 
> This is not the only unchecked thing in this demuxer: Every use of
> dynarray_add contains one.

True, but preferably a new ticket should be opened for that, as that seems 
like a bigger task to fix properly, and the original ticket did not 
mention that.

Regards,
Marton


More information about the ffmpeg-devel mailing list