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:
aa9c6b6
)
avcodec/dvbsubdec: Fix buf_size check in dvbsub_parse_display_definition_segment()
author
banastasov
<btanastasov@yahoo.co.uk>
Sat, 30 May 2015 02:28:39 +0000
(
04:28
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 30 May 2015 02:29:58 +0000
(
04:29
+0200)
Fixes Ticket4326
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dvbsubdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/dvbsubdec.c
b/libavcodec/dvbsubdec.c
index
7c3dedf
..
e268e2a
100644
(file)
--- a/
libavcodec/dvbsubdec.c
+++ b/
libavcodec/dvbsubdec.c
@@
-1504,10
+1504,10
@@
static int dvbsub_parse_display_definition_segment(AVCodecContext *avctx,
avctx->height = display_def->height;
}
- if (buf_size < 13)
- return AVERROR_INVALIDDATA;
-
if (info_byte & 1<<3) { // display_window_flag
+ if (buf_size < 13)
+ return AVERROR_INVALIDDATA;
+
display_def->x = bytestream_get_be16(&buf);
display_def->width = bytestream_get_be16(&buf) - display_def->x + 1;
display_def->y = bytestream_get_be16(&buf);