From b12a8d47ba8a803cae88718249b8d3f7d4a85948 Mon Sep 17 00:00:00 2001 From: Samuel Gaist Date: Thu, 19 Sep 2013 09:13:25 +0200 Subject: Add missing variables initialization before requesting png offset Initialize all values read to sensible default in case reading them fails. Qt 5 fix commit 0ab3e290c4808f73d46903a5274929e3833d8d3c Task-number: QTBUG-32674 Change-Id: I3a120b5673b67f705a4ebec4359aa52e2392492a Reviewed-by: aavit --- src/gui/image/qpnghandler.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp index ac78610..e942f4a 100644 --- a/src/gui/image/qpnghandler.cpp +++ b/src/gui/image/qpnghandler.cpp @@ -490,13 +490,13 @@ bool Q_INTERNAL_WIN_NO_THROW QPngHandlerPrivate::readPngImage(QImage *outImage) return false; } - png_uint_32 width; - png_uint_32 height; - png_int_32 offset_x; - png_int_32 offset_y; - int bit_depth; - int color_type; - int unit_type; + png_uint_32 width = 0; + png_uint_32 height = 0; + png_int_32 offset_x = 0; + png_int_32 offset_y = 0; + int bit_depth = 0; + int color_type = 0; + int unit_type = PNG_OFFSET_PIXEL; png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, 0, 0, 0); png_get_oFFs(png_ptr, info_ptr, &offset_x, &offset_y, &unit_type); -- cgit v0.12