[FFmpeg-cvslog] avformat/allformats: test pointer to be used

AlexisWilke git at videolan.org
Tue Jan 12 05:20:42 EET 2021


ffmpeg | branch: master | AlexisWilke <alexis at m2osw.com> | Mon Jan  4 10:11:01 2021 -0800| [ca21cb1e36ccae2ee71d4299d477fa9284c1f551] | committer: James Almer

avformat/allformats: test pointer to be used

Two tests check the opposite pointer before using it. If only one of these
is set to a valid pointer, one of these functions will crash, the other will
ignore the pointer.

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca21cb1e36ccae2ee71d4299d477fa9284c1f551
---

 libavformat/allformats.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 0e0caaad39..6990af55f4 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -541,7 +541,7 @@ const AVOutputFormat *av_muxer_iterate(void **opaque)
 
     if (i < size) {
         f = muxer_list[i];
-    } else if (indev_list) {
+    } else if (outdev_list) {
         f = outdev_list[i - size];
     }
 
@@ -558,7 +558,7 @@ const AVInputFormat *av_demuxer_iterate(void **opaque)
 
     if (i < size) {
         f = demuxer_list[i];
-    } else if (outdev_list) {
+    } else if (indev_list) {
         f = indev_list[i - size];
     }
 



More information about the ffmpeg-cvslog mailing list