[FFmpeg-devel] [PATCH 1/2] avutil/tx: remove deadcode of the control flow
Lynne
dev at lynne.ee
Fri Jan 28 09:30:33 EET 2022
28 Jan 2022, 08:07 by dev at lynne.ee:
> 28 Jan 2022, 03:08 by lq at chinaffmpeg.org:
>
>> From: Steven Liu <liuqi05 at kuaishou.com>
>>
>> Fix CID: 1497864
>> The control flow should return ENOSYS if nb_cd_matches is 0 at before
>> and the ret equal AVERROR(ENOMEM) or goto end label, so remove the last
>> control flow if (ret >= 0) before end label.
>>
>> Signed-off-by: Steven Liu <liuqi05 at kuaishou.com>
>> ---
>> libavutil/tx.c | 3 ---
>> 1 file changed, 3 deletions(-)
>>
>> diff --git a/libavutil/tx.c b/libavutil/tx.c
>> index 2897f3bd35..50616adba7 100644
>> --- a/libavutil/tx.c
>> +++ b/libavutil/tx.c
>> @@ -601,9 +601,6 @@ av_cold int ff_tx_init_subtx(AVTXContext *s, enum AVTXType type,
>>
>> av_free(sub);
>>
>> - if (ret >= 0)
>> - ret = AVERROR(ENOSYS);
>> -
>> end:
>> av_free(cd_matches);
>> return ret;
>>
>
> Sorry, neither of those is correct.
> I'll push my own.
>
Had been thinking about eliminating context allocations if
the codelet requires no context, but I decided it's too much trouble.
Pushed both as-is, with some minor change on the malloc test.
Thanks. I should get Coverity access too some day.
More information about the ffmpeg-devel
mailing list