[FFmpeg-cvslog] rpl: Dont fill the index with entries that failed to be parsed

Michael Niedermayer git at videolan.org
Thu Dec 19 20:07:37 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 19 19:22:38 2013 +0100| [5eeeb4abf9705891f4dd1a4499588428319dec24] | committer: Michael Niedermayer

rpl: Dont fill the index with entries that failed to be parsed

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fd10a199a3c_6204_landing.rpl
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/rpl.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/rpl.c b/libavformat/rpl.c
index 85b573e..fb60379 100644
--- a/libavformat/rpl.c
+++ b/libavformat/rpl.c
@@ -254,8 +254,10 @@ static int rpl_read_header(AVFormatContext *s)
         int64_t offset, video_size, audio_size;
         error |= read_line(pb, line, sizeof(line));
         if (3 != sscanf(line, "%"SCNd64" , %"SCNd64" ; %"SCNd64,
-                        &offset, &video_size, &audio_size))
+                        &offset, &video_size, &audio_size)) {
             error = -1;
+            continue;
+        }
         av_add_index_entry(vst, offset, i * rpl->frames_per_chunk,
                            video_size, rpl->frames_per_chunk, 0);
         if (ast)



More information about the ffmpeg-cvslog mailing list