aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-23 05:21:10 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-03-23 05:21:52 +0100
commitcc415956a45cd17ab74aae3bb7465953c387d458 (patch)
tree7e9d82365f880870659d9bdeb59c0dc39aefc17f
parentac2cb279162218e92a5663caac27d695e6514b69 (diff)
downloadffmpeg-cc415956a45cd17ab74aae3bb7465953c387d458.tar.gz
error_conceal: fix FPE in guess_dc() with huge sizes.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/error_resilience.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index 1c1420f93c..cd6aa01803 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -174,7 +174,7 @@ static void guess_dc(MpegEncContext *s, int16_t *dc, int w,
{
int b_x, b_y;
int16_t (*col )[4] = av_malloc(stride*h*sizeof( int16_t)*4);
- uint16_t (*dist)[4] = av_malloc(stride*h*sizeof(uint16_t)*4);
+ uint32_t (*dist)[4] = av_malloc(stride*h*sizeof(uint32_t)*4);
for(b_y=0; b_y<h; b_y++){
int color= 1024;