File us-Delete-row_pointers-array-in-png-error-handl... of Package celestia

Overview Repositories Revisions Requests Users Attributes Meta

File us-Delete-row_pointers-array-in-png-error-handler.patch of Package celestia (Revision cc00a3f458e980b1e36f07d9fe215396)

Currently displaying revision cc00a3f458e980b1e36f07d9fe215396 , Show latest

From d6eb8cd2da17de69a8ac0612280fd6766258e056 Mon Sep 17 00:00:00 2001
From: Andrew Tribick <ajtribick@googlemail.com>
Date: Mon, 4 Nov 2024 20:50:14 +0100
Subject: [PATCH] Delete row_pointers array in png error handler

---
 src/celengine/image.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/celengine/image.cpp b/src/celengine/image.cpp
index 12b90c73e2..5de784feb9 100644
--- a/src/celengine/image.cpp
+++ b/src/celengine/image.cpp
@@ -613,8 +613,8 @@ Image* LoadPNGImage(const string& filename)
     if (setjmp(png_jmpbuf(png_ptr)))
     {
         fclose(fp);
-        if (img != NULL)
-            delete img;
+        delete row_pointers;
+        delete img;
         png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL);
         clog << _("Error reading PNG image file ") << filename << '\n';
         return NULL;
@@ -693,6 +693,7 @@ Image* LoadPNGImage(const string& filename)
     png_read_image(png_ptr, row_pointers);
 
     delete[] row_pointers;
+    row_pointers = NULL;
 
     png_read_end(png_ptr, NULL);
     png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
@@ -806,7 +807,7 @@ static Image* LoadBMPImage(ifstream& in)
     }
     if (!readInteger(in, imageHeader.imageSize))
         return NULL;
-    
+
     unsigned char* palette = NULL;
     if (imageHeader.bpp == 8)
     {

Places

File us-Delete-row_pointers-array-in-png-error-handler.patch of Package celestia (Revision cc00a3f458e980b1e36f07d9fe215396)

Places