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:
4f76697
)
Check for packet_length 0, it is already treated as invalid by the padding check,
author
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Mon, 6 Jul 2009 17:08:32 +0000
(17:08 +0000)
committer
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Mon, 6 Jul 2009 17:08:32 +0000
(17:08 +0000)
but that resulted in a confusing/wrong error message.
Originally committed as revision 19361 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/asfdec.c
patch
|
blob
|
history
diff --git
a/libavformat/asfdec.c
b/libavformat/asfdec.c
index
373be28
..
9f445ec
100644
(file)
--- a/
libavformat/asfdec.c
+++ b/
libavformat/asfdec.c
@@
-633,7
+633,7
@@
static int ff_asf_get_packet(AVFormatContext *s, ByteIOContext *pb)
DO_2BITS(asf->packet_flags >> 3, padsize, 0); // padding length
//the following checks prevent overflows and infinite loops
- if(packet_length >= (1U<<29)){
+ if(
!packet_length ||
packet_length >= (1U<<29)){
av_log(s, AV_LOG_ERROR, "invalid packet_length %d at:%"PRId64"\n", packet_length, url_ftell(pb));
return -1;
}