[FFmpeg-devel] [PATCH 1/2] avutil/tx: remove deadcode of the control flow

[FFmpeg-devel] [PATCH 1/2] avutil/tx: remove deadcode of the control flow

[Steven Liu]

From: Steven Liu <liuqi05@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@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;
-- 
2.25.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/2] avutil/tx: add null pointer check after av_mallocz

[Steven Liu]

From: Steven Liu <liuqi05@kuaishou.com>

Fix CID: 1497863
there will get null pointer in attempt to initialize each if alloc memory failed.

Signed-off-by: Steven Liu <liuqi05@kuaishou.com>
---
 libavutil/tx.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavutil/tx.c b/libavutil/tx.c
index 50616adba7..79c9477d7f 100644
--- a/libavutil/tx.c
+++ b/libavutil/tx.c
@@ -567,6 +567,10 @@ av_cold int ff_tx_init_subtx(AVTXContext *s, enum AVTXType type,
 
     if (!s->sub)
         s->sub = sub = av_mallocz(TX_MAX_SUB*sizeof(*sub));
+    if (!s->sub) {
+        ret = AVERROR(ENOMEM);
+        goto end;
+    }
 
     /* Attempt to initialize each */
     for (int i = 0; i < nb_cd_matches; i++) {
-- 
2.25.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 1/2] avutil/tx: remove deadcode of the control flow

[Lynne]

28 Jan 2022, 03:08 by lq@chinaffmpeg.org:

> From: Steven Liu <liuqi05@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@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.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 1/2] avutil/tx: remove deadcode of the control flow

[Lynne]

28 Jan 2022, 08:07 by dev@lynne.ee:

> 28 Jan 2022, 03:08 by lq@chinaffmpeg.org:
>
>> From: Steven Liu <liuqi05@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@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.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".