[FFmpeg-devel] [PATCH] aviobuf: cap len to orig_buffer_size

Josh de Kock josh at itanimul.li
Wed Jul 20 19:13:14 EEST 2016


Note: I don't know much about the issue itself, just converting the suggested changes into patch form
---
 libavformat/aviobuf.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 31e7202..b0a6208 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -532,8 +532,10 @@ static void fill_buffer(AVIOContext *s)
 
             s->checksum_ptr = dst = s->buffer;
         }
-        av_assert0(len >= s->orig_buffer_size);
-        len = s->orig_buffer_size;
+        if (len >= s->orig_buffer_size)
+            len = s->orig_buffer_size;
+        /* else len is less than orig_buffer_size, but is sized correctly to
+           fill remainder of buffer. */
     }
 
     if (s->read_packet)
-- 
2.7.4 (Apple Git-66)



More information about the ffmpeg-devel mailing list