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:
a5dc990
)
rv34: check for size mismatch
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 17 Sep 2011 17:40:25 +0000
(19:40 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 17 Sep 2011 18:17:10 +0000
(20:17 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/rv34.c
patch
|
blob
|
history
diff --git
a/libavcodec/rv34.c
b/libavcodec/rv34.c
index
62425a0
..
ca727a5
100644
(file)
--- a/
libavcodec/rv34.c
+++ b/
libavcodec/rv34.c
@@
-1343,6
+1343,10
@@
static int rv34_decode_slice(RV34DecContext *r, int end, const uint8_t* buf, int
av_log(s->avctx, AV_LOG_ERROR, "Slice type mismatch\n");
return AVERROR_INVALIDDATA;
}
+ if (s->width != r->si.width || s->height != r->si.height) {
+ av_log(s->avctx, AV_LOG_ERROR, "Size mismatch\n");
+ return AVERROR_INVALIDDATA;
+ }
}
r->si.end = end;