[FFmpeg-cvslog] tools/opt_common: Check for malloc failure
Michael Niedermayer
git at videolan.org
Sat May 25 01:57:01 EEST 2024
ffmpeg | branch: release/6.1 | Michael Niedermayer <michael at niedermayer.cc> | Sun Apr 28 18:33:24 2024 +0200| [b91b594dbd5d83b0afcc68e1d99a17ef95ba607d] | committer: Michael Niedermayer
tools/opt_common: Check for malloc failure
Fixes: CID1539100 Negative loop bound
Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit ba7038043a46420bc86b060dbb13b956ea50ac03)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b91b594dbd5d83b0afcc68e1d99a17ef95ba607d
---
fftools/opt_common.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/fftools/opt_common.c b/fftools/opt_common.c
index 02d7048c42..6259097ee8 100644
--- a/fftools/opt_common.c
+++ b/fftools/opt_common.c
@@ -724,10 +724,13 @@ int show_codecs(void *optctx, const char *opt, const char *arg)
return 0;
}
-static void print_codecs(int encoder)
+static int print_codecs(int encoder)
{
const AVCodecDescriptor **codecs;
- unsigned i, nb_codecs = get_codecs_sorted(&codecs);
+ int i, nb_codecs = get_codecs_sorted(&codecs);
+
+ if (nb_codecs < 0)
+ return nb_codecs;
printf("%s:\n"
" V..... = Video\n"
@@ -762,18 +765,17 @@ static void print_codecs(int encoder)
}
}
av_free(codecs);
+ return 0;
}
int show_decoders(void *optctx, const char *opt, const char *arg)
{
- print_codecs(0);
- return 0;
+ return print_codecs(0);
}
int show_encoders(void *optctx, const char *opt, const char *arg)
{
- print_codecs(1);
- return 0;
+ return print_codecs(1);
}
int show_bsfs(void *optctx, const char *opt, const char *arg)
More information about the ffmpeg-cvslog
mailing list