From 8510247b5fe5a7cdcbd905eed7627ade4c9972f7 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 30 Jul 2015 11:14:46 -0500 Subject: [PATCH] [libpng16] Fixed uninitialized variable in contrib/gregbook/rpng2-x.c and fixed potential leak of png_pixels in contrib/pngminus/pnm2png.c --- ANNOUNCE | 2 ++ CHANGES | 2 ++ contrib/gregbook/rpng2-x.c | 7 +++---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index fd912bf80..d68c6e590 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -37,6 +37,8 @@ Version 1.6.19beta01 [July 29, 2015] Suppressed some warnings from the Borland C++ 5.5.1/5.82 compiler (Bug report by Viktor Szaka'ts). Several warnings remain and are unavoidable, where we test for overflow. + Fixed potential leak of png_pixels in contrib/pngminus/pnm2png.c + Fixed uninitialized variable in contrib/gregbook/rpng2-x.c Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 733a7c835..43a8531dc 100644 --- a/CHANGES +++ b/CHANGES @@ -5316,6 +5316,8 @@ Version 1.6.19beta01 [July 29, 2015] Suppressed some warnings from the Borland C++ 5.5.1/5.82 compiler (Bug report by Viktor Szaka'ts). Several warnings remain and are unavoidable, where we test for overflow. + Fixed potential leak of png_pixels in contrib/pngminus/pnm2png.c + Fixed uninitialized variable in contrib/gregbook/rpng2-x.c Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/contrib/gregbook/rpng2-x.c b/contrib/gregbook/rpng2-x.c index cf371014c..eea95fbd4 100644 --- a/contrib/gregbook/rpng2-x.c +++ b/contrib/gregbook/rpng2-x.c @@ -43,12 +43,10 @@ - 2.03: deleted runtime MMX-enabling/disabling and obsolete -mmx* options - 2.04: Added "void(foo);" statements to quiet pedantic compiler warnings about unused variables (GR-P) - - TO DO: - use nanosleep() instead of usleep(), which is obsolete/deprecated. + - 2.05: Use nanosleep() instead of usleep(), which is deprecated (GR-P). --------------------------------------------------------------------------- - Copyright (c) 1998-2008 Greg Roelofs. All rights reserved. + Copyright (c) 1998-2010, 2014-2015 Greg Roelofs. All rights reserved. This software is provided "as is," without warranty of any kind, express or implied. In no event shall the author or contributors @@ -119,6 +117,7 @@ # undef usleep # define usleep(usec) { \ struct timespec ts; \ + ts.tv_sec = 0; \ ts.tv_nsec = (usec) * 1000; \ nanosleep(&ts, NULL); } # endif