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:
d65d834
)
avsdec: Set dimensions instead of relying on the demuxer.
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 20 Apr 2012 15:42:18 +0000
(17:42 +0200)
committer
Anton Khirnov
<anton@khirnov.net>
Sat, 29 Sep 2012 17:18:07 +0000
(19:18 +0200)
The decode function assumes that the video will have those dimensions.
Fixes CVE-2012-2801
CC:libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
libavcodec/avs.c
patch
|
blob
|
history
diff --git
a/libavcodec/avs.c
b/libavcodec/avs.c
index
d4e2837
..
b8ee1e1
100644
(file)
--- a/
libavcodec/avs.c
+++ b/
libavcodec/avs.c
@@
-158,6
+158,7
@@
avs_decode_frame(AVCodecContext * avctx,
static av_cold int avs_decode_init(AVCodecContext * avctx)
{
avctx->pix_fmt = PIX_FMT_PAL8;
+ avcodec_set_dimensions(avctx, 318, 198);
return 0;
}