diff --git a/contrib/gregbook/rpng2-win.c b/contrib/gregbook/rpng2-win.c
index ed6b526ecb..94050cb856 100644
--- a/contrib/gregbook/rpng2-win.c
+++ b/contrib/gregbook/rpng2-win.c
@@ -651,7 +651,7 @@ static void rpng2_win_init()
 
     /* Guard against integer overflow */
     if (rpng2_info.height > ((size_t)(-1))/rowbytes) {
-        fprintf(stderr, PROGNAME ":  image_data buffer would be too large\n",
+        fprintf(stderr, PROGNAME ":  image_data buffer would be too large\n");
         readpng2_cleanup(&rpng2_info);
         return;
     }
diff --git a/contrib/visupng/PngFile.c b/contrib/visupng/PngFile.c
index afff03b6d6..8b875fd68c 100644
--- a/contrib/visupng/PngFile.c
+++ b/contrib/visupng/PngFile.c
@@ -131,6 +131,7 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
     if (png_sig_cmp(pbSig, 0, 8))
     {
         *ppbImageData = pbImageData = NULL;
+        fclose(pfFile);
         return FALSE;
     }
 
@@ -141,6 +142,7 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
     if (!png_ptr)
     {
         *ppbImageData = pbImageData = NULL;
+        fclose(pfFile);
         return FALSE;
     }
 
@@ -149,6 +151,7 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
     {
         png_destroy_read_struct(&png_ptr, NULL, NULL);
         *ppbImageData = pbImageData = NULL;
+        fclose(pfFile);
         return FALSE;
     }
 
@@ -280,6 +283,7 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
     {
         png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
 
+        if (pbImageData) free (pbImageData);
         *ppbImageData = pbImageData = NULL;
 
         if(ppbRowPointers)