git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b438c20
)
avformat/mov: Check extradata before access
author
Michael Niedermayer
<michael@niedermayer.cc>
Tue, 16 Aug 2016 16:07:11 +0000
(18:07 +0200)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Tue, 16 Aug 2016 17:47:23 +0000
(19:47 +0200)
Fixes NULL ptr dereference
Fixes Ticket5778
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/mov.c
patch
|
blob
|
history
diff --git
a/libavformat/mov.c
b/libavformat/mov.c
index
f4c35d7
..
134953e
100644
(file)
--- a/
libavformat/mov.c
+++ b/
libavformat/mov.c
@@
-4830,8
+4830,9
@@
static int mov_read_close(AVFormatContext *s)
av_freep(&sc->rap_group);
av_freep(&sc->display_matrix);
- for (j = 0; j < sc->stsd_count; j++)
- av_free(sc->extradata[j]);
+ if (sc->extradata)
+ for (j = 0; j < sc->stsd_count; j++)
+ av_free(sc->extradata[j]);
av_freep(&sc->extradata);
av_freep(&sc->extradata_size);