[goffice] Fix critical in go_doc_finalize. [#628467]



commit 917f281a735cc6ca37905dadce40673148b63a5d
Author: Jean Brefort <jean brefort normalesup org>
Date:   Wed Sep 1 16:25:45 2010 +0200

    Fix critical in go_doc_finalize. [#628467]

 ChangeLog            |    7 ++++++-
 NEWS                 |    1 +
 goffice/app/go-doc.c |    6 ++----
 3 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4c4f48e..cb4bd67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
+2010-09-01  Jean Brefort  <jean brefort normalesup org>
+
+	* goffice/app/go-doc.c (load_image_data): don't unref the image at
+	this point. [#628467]
+
 2010-09-01  Morten Welinder  <terra gnome org>
 
 	* goffice/app/go-doc.c (go_doc_init_read, go_doc_init_write): Make
-	->imagebug own the ids.
+	->imagebuf own the ids.
 	(go_doc_save_image, go_doc_image_fetch): Copy image ids.
 
 2010-08-31  Andreas J. Guelzow <aguelzow pyrshep ca>
diff --git a/NEWS b/NEWS
index 5476590..5c9dd88 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ Jean:
 	* Do not save image filling with no image. [#627690]
 	* Don't use g_free instead of xmlFree. [#627700]
 	* Optionnaly delete trendlines from legend. [#628031]
+	* Fix critical in go_doc_finalize. [#628467]
 
 Morten:
 	* Limit formats to sane number of decimals.  [#627066]
diff --git a/goffice/app/go-doc.c b/goffice/app/go-doc.c
index 95ea3cd..c812ddf 100644
--- a/goffice/app/go-doc.c
+++ b/goffice/app/go-doc.c
@@ -490,12 +490,10 @@ load_image_data (GsfXMLIn *xin, GsfXMLBlob *unknown)
 	 * of the one created by go_doc_image_fetch, so let's just make
 	 * certain they share the same id. Anyway this should not happen
 	 * very often (may be with a company logo?) and it is not so
-	 * harmful since the duplicationwill not survive
+	 * harmful since the duplication will not survive
 	 * serialization. (Jean)
 	 */
-	if (real == image)
-		g_object_unref (image);
-	else
+	if (real != image)
 		go_image_set_name (image, go_image_get_name (real));
 	g_object_set_data (G_OBJECT (doc), "new image", NULL);
 }



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