From 5b9d2fa3a163fb43731dfa7d991fcb5e9d2a8e61 Mon Sep 17 00:00:00 2001
From: lecoanet
Date: Mon, 27 May 2002 15:03:08 +0000
Subject:         * Les ressources de type images/bitmaps d�finies dans zinc
 (-tile, 	  -mapdistancesymbol, etc), ne pouvaient pas �tre remises �
 "". 	* Une consultation de la valeur de ces ressources provoquait un 
   core dump si la ressource valait "".

---
 generic/tkZinc.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'generic/tkZinc.c')

diff --git a/generic/tkZinc.c b/generic/tkZinc.c
index da858a2..8f2bd99 100644
--- a/generic/tkZinc.c
+++ b/generic/tkZinc.c
@@ -447,6 +447,10 @@ ZnBitmapParse(ClientData	client_data,
     }
     *image_ptr = image;
   }
+  else if (prev_image != NULL) {
+    ZnFreeImage(prev_image);
+    *image_ptr = NULL;
+  }
   return ZN_OK;
 }
 
@@ -474,6 +478,10 @@ ZnImageParse(ClientData	client_data,
     }
     *image_ptr = image;
   }
+  else if (prev_image != NULL) {
+    ZnFreeImage(prev_image);
+    *image_ptr = NULL;
+  }
   return ZN_OK;
 }
 
@@ -485,7 +493,7 @@ ZnImagePrint(ClientData		client_data,
 	     Tcl_FreeProc	**free_proc)
 {
   ZnImage image = *(ZnImage *) (widget_rec + offset);
-  return NewStringObj(ZnNameOfImage(image));
+  return NewStringObj(image?ZnNameOfImage(image):"");
 }
 
 
-- 
cgit v1.1