1. ffmpeg
  2. Commit 190e8b42834cb7a8af12db25b0f5c8b63abf99a5
Browse code

swscale/utils: clear formatConvBuffer on allocation

Fixes use of uninitialized memory
Fixes: asan_heap-oob_35ca682_1474_cov_3230122439_aletrek_tga_16bit.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 007498fc1a639ecee2cda1892cbcff66c7c8c951)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2015/02/27 11:12:23
Showing 1 changed files
libswscale/utils.c
History View file @ 190e8b4
... ... 
@@ -1050,7 +1050,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
1050 1050 
     c->chrDstW = -((-dstW) >> c->chrDstHSubSample);
1051 1051 
     c->chrDstH = -((-dstH) >> c->chrDstVSubSample);
1052 1052
1053 
-    FF_ALLOC_OR_GOTO(c, c->formatConvBuffer, FFALIGN(srcW*2+78, 16) * 2, fail);
1053 
+    FF_ALLOCZ_OR_GOTO(c, c->formatConvBuffer, FFALIGN(srcW*2+78, 16) * 2, fail);
1054 1054
1055 1055 
     /* unscaled special cases */
1056 1056 
     if (unscaled && !usesHFilter && !usesVFilter &&