1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

png: initialize color_type to 0

Browse Source 
Fixes
==12==WARNING: MemorySanitizer: use-of-uninitialized-value
    #0 0x6b8179 in setup_qt /src/qtbase/src/gui/image/qpnghandler.cpp:247:9
on fuzzed file

Change-Id: I772d536a0db91665dc16e94751ef507de1064376
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
This commit is contained in:
Albert Astals Cid 2019-01-30 01:31:30 +01:00 committed by Albert Astals Cid
parent 5d885c8325
commit f383fa4b9c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/image/qpnghandler.cpp
View File

@ -234,7 +234,7 @@ void setup_qt(QImage& image, png_structp png_ptr, png_infop info_ptr, QSize scal
png_uint_32 width; png_uint_32 width;
png_uint_32 height; png_uint_32 height;
int bit_depth; int bit_depth;
int color_type; int color_type = 0;
png_bytep trans_alpha = 0; png_bytep trans_alpha = 0;
png_color_16p trans_color_p = 0; png_color_16p trans_color_p = 0;
int num_trans; int num_trans;
@ -678,7 +678,7 @@ QImage::Format QPngHandlerPrivate::readImageFormat()
{ {
QImage::Format format = QImage::Format_Invalid; QImage::Format format = QImage::Format_Invalid;
png_uint_32 width, height; png_uint_32 width, height;
int bit_depth, color_type; int bit_depth, color_type = 0;
png_colorp palette; png_colorp palette;
int num_palette; int num_palette;
png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, 0, 0, 0); png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, 0, 0, 0);