diff mbox

[FFmpeg-devel,6/6] avcodec/movtextdec: run mov_text_cleanup() before overwriting pointers

Message ID 20170308222843.9289-6-michael@niedermayer.cc
State Accepted
Commit bac9c03ed9328c63aba46e280ba408431b53fcb4
Headers show

Commit Message

Michael Niedermayer March 8, 2017, 10:28 p.m. UTC 
Fixes: memleak
Fixes: 741/clusterfuzz-testcase-586996200452915

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/movtextdec.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Michael Niedermayer March 9, 2017, 10:26 p.m. UTC | #1 
On Wed, Mar 08, 2017 at 11:28:43PM +0100, Michael Niedermayer wrote:
> Fixes: memleak
> Fixes: 741/clusterfuzz-testcase-586996200452915
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/movtextdec.c | 2 ++
>  1 file changed, 2 insertions(+)

applied

[...]
diff mbox

Patch

diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c
index 6de15004fc..fb5085c3e8 100644
--- a/libavcodec/movtextdec.c
+++ b/libavcodec/movtextdec.c
@@ -459,6 +459,8 @@  static int mov_text_decode_frame(AVCodecContext *avctx,
     end = ptr + FFMIN(2 + text_length, avpkt->size);
     ptr += 2;
 
+    mov_text_cleanup(m);
+
     tsmb_size = 0;
     m->tracksize = 2 + text_length;
     m->style_entries = 0;