diff mbox

[FFmpeg-devel,1/2] avformat/mov: Fix extradata memleak

Message ID 20180410002820.15374-1-michael@niedermayer.cc
State Accepted
Commit 0a8133119ca5d087c7c7140d100406ff84c477ee
Headers show

Commit Message

Michael Niedermayer April 10, 2018, 12:28 a.m. UTC 
Fixes: crbug 822705

Reported-by: Matt Wolenetz <wolenetz@google.com>
Reviewed-by: Matt Wolenetz <wolenetz@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/mov.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Michael Niedermayer April 12, 2018, 9:32 p.m. UTC | #1 
On Tue, Apr 10, 2018 at 02:28:19AM +0200, Michael Niedermayer wrote:
> Fixes: crbug 822705
> 
> Reported-by: Matt Wolenetz <wolenetz@google.com>
> Reviewed-by: Matt Wolenetz <wolenetz@google.com>
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavformat/mov.c | 6 ++++++
>  1 file changed, 6 insertions(+)

will apply

[...]
diff mbox

Patch

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 97b1462aab..1340bf3913 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2592,6 +2592,12 @@  static int mov_read_stsd(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 
     return mov_finalize_stsd_codec(c, pb, st, sc);
 fail:
+    if (sc->extradata) {
+        int j;
+        for (j = 0; j < sc->stsd_count; j++)
+            av_freep(&sc->extradata[j]);
+    }
+
     av_freep(&sc->extradata);
     av_freep(&sc->extradata_size);
     return ret;