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:
1f41cff
)
matroskadec: check h in generic rm packet shuffler
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 11 Nov 2012 00:00:04 +0000
(
01:00
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 11 Nov 2012 00:19:44 +0000
(
01:19
+0100)
Fixes crash
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/matroskadec.c
patch
|
blob
|
history
diff --git
a/libavformat/matroskadec.c
b/libavformat/matroskadec.c
index
ec279ed
..
61ba6ec
100644
(file)
--- a/
libavformat/matroskadec.c
+++ b/
libavformat/matroskadec.c
@@
-2032,7
+2032,7
@@
static int matroska_parse_rm_audio(MatroskaDemuxContext *matroska,
}
memcpy(track->audio.buf + y*w, data, w);
} else {
- if (size < sps * w / sps) {
+ if (size < sps * w / sps
|| h<=0
) {
av_log(matroska->ctx, AV_LOG_ERROR,
"Corrupt generic RM-style audio packet size\n");
return AVERROR_INVALIDDATA;