projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
696ace5
)
ipmovie: do not read audio packets before the codec is known
author
Janne Grunau
<janne-libav@jannau.net>
Thu, 5 Jan 2012 20:57:22 +0000
(21:57 +0100)
committer
Janne Grunau
<janne-libav@jannau.net>
Thu, 5 Jan 2012 22:19:14 +0000
(23:19 +0100)
Prevents a division by zero.
libavformat/ipmovie.c
patch
|
blob
|
history
diff --git
a/libavformat/ipmovie.c
b/libavformat/ipmovie.c
index
4bd3580
..
bd5ec30
100644
(file)
--- a/
libavformat/ipmovie.c
+++ b/
libavformat/ipmovie.c
@@
-116,6
+116,11
@@
static int load_ipmovie_packet(IPMVEContext *s, AVIOContext *pb,
int chunk_type;
if (s->audio_chunk_offset) {
+ if (s->audio_type == CODEC_ID_NONE) {
+ av_log(NULL, AV_LOG_ERROR, "Can not read audio packet before"
+ "audio codec is known\n");
+ return CHUNK_BAD;
+ }
/* adjust for PCM audio by skipping chunk header */
if (s->audio_type != CODEC_ID_INTERPLAY_DPCM) {