projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
20e1829
)
mp4: Don't read an empty Decoder Config Descriptor
author
Alex Converse
<alex.converse@gmail.com>
Wed, 21 Sep 2011 22:26:35 +0000
(15:26 -0700)
committer
Alex Converse
<alex.converse@gmail.com>
Thu, 22 Sep 2011 17:09:04 +0000
(10:09 -0700)
libavformat/isom.c
patch
|
blob
|
history
diff --git
a/libavformat/isom.c
b/libavformat/isom.c
index
48fd8e1
..
896730c
100644
(file)
--- a/
libavformat/isom.c
+++ b/
libavformat/isom.c
@@
-418,7
+418,7
@@
int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext
len = ff_mp4_read_descr(fc, pb, &tag);
if (tag == MP4DecSpecificDescrTag) {
av_dlog(fc, "Specific MPEG4 header len=%d\n", len);
- if
(
(uint64_t)len > (1<<30))
+ if
(!len ||
(uint64_t)len > (1<<30))
return -1;
av_free(st->codec->extradata);
st->codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE);