[dia] Bug 677243 - use xmlFree() for return value of xmlNodeGetContent()



commit faeeb27c27d4364dd2dbea49aae19f68b410d007
Author: Hans Breuer <hans breuer org>
Date:   Fri Jun 22 20:08:35 2012 +0200

    Bug 677243 - use xmlFree() for return value of xmlNodeGetContent()

 lib/sheet.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/lib/sheet.c b/lib/sheet.c
index 06c3f19..7f02e65 100644
--- a/lib/sheet.c
+++ b/lib/sheet.c
@@ -354,7 +354,7 @@ load_register_sheet(const gchar *dirname, const gchar *filename,
     gchar *iconname = NULL;
 
     int subdesc_score = -1;
-    gchar *objdesc = NULL;
+    xmlChar *objdesc = NULL;
 
     gint intdata = 0;
     gchar *chardata = NULL;
@@ -414,8 +414,8 @@ load_register_sheet(const gchar *dirname, const gchar *filename,
 
 	if (subdesc_score < 0 || score < subdesc_score) {
 	  subdesc_score = score;
-	  if (objdesc) free(objdesc);
-	  objdesc = (gchar *) xmlNodeGetContent(subnode);
+	  if (objdesc) xmlFree(objdesc);
+	  objdesc = xmlNodeGetContent(subnode);
 	}
 	  
       } else if (subnode->ns == ns && !xmlStrcmp(subnode->name, (const xmlChar *)"icon")) {
@@ -438,7 +438,7 @@ load_register_sheet(const gchar *dirname, const gchar *filename,
 
     sheet_obj = g_new(SheetObject,1);
     sheet_obj->object_type = g_strdup((char *) ot_name);
-    sheet_obj->description = g_strdup(objdesc);
+    sheet_obj->description = g_strdup((gchar *)objdesc);
     xmlFree(objdesc); objdesc = NULL;
 
     sheet_obj->pixmap = NULL;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]