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:
d8030c1
)
avcodec/jpeg2000dec: Check tile offsets more completely
author
Michael Niedermayer
<michael@niedermayer.cc>
Sun, 28 May 2017 11:52:13 +0000
(13:52 +0200)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Sun, 28 May 2017 11:52:13 +0000
(13:52 +0200)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/jpeg2000dec.c
patch
|
blob
|
history
diff --git
a/libavcodec/jpeg2000dec.c
b/libavcodec/jpeg2000dec.c
index
db4bb50
..
69979e0
100644
(file)
--- a/
libavcodec/jpeg2000dec.c
+++ b/
libavcodec/jpeg2000dec.c
@@
-300,7
+300,10
@@
static int get_siz(Jpeg2000DecoderContext *s)
if (s->tile_offset_x < 0 || s->tile_offset_y < 0 ||
s->image_offset_x < s->tile_offset_x ||
- s->image_offset_y < s->tile_offset_y) {
+ s->image_offset_y < s->tile_offset_y ||
+ s->tile_width + (int64_t)s->tile_offset_x <= s->image_offset_x ||
+ s->tile_height + (int64_t)s->tile_offset_y <= s->image_offset_y
+ ) {
av_log(s->avctx, AV_LOG_ERROR, "Tile offsets are invalid\n");
return AVERROR_INVALIDDATA;
}