OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1d5b35c
)
Avoid huge memory allocations from asf demuxer.
author
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Sat, 2 Mar 2013 17:37:55 +0000
(18:37 +0100)
committer
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Sat, 2 Mar 2013 17:37:55 +0000
(18:37 +0100)
Fixes ticket #1888.
libavformat/asfdec.c
patch
|
blob
|
history
diff --git
a/libavformat/asfdec.c
b/libavformat/asfdec.c
index
233b6ca
..
38f46a6
100644
(file)
--- a/
libavformat/asfdec.c
+++ b/
libavformat/asfdec.c
@@
-1011,6
+1011,7
@@
static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb)
asf->packet_obj_size = avio_rl32(pb);
if (asf->packet_obj_size >= (1 << 24) || asf->packet_obj_size <= 0) {
av_log(s, AV_LOG_ERROR, "packet_obj_size invalid\n");
+ asf->packet_obj_size = 0;
return AVERROR_INVALIDDATA;
}
asf->packet_frag_timestamp = avio_rl32(pb); // timestamp