gnumeric r16636 - in trunk: . plugins/excel

[mortenw svn gnome org]

Author: mortenw
Date: Thu Jun 19 21:01:42 2008
New Revision: 16636
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16636&view=rev

Log:
2008-06-19  Morten Welinder  <terra gnome org>

	* ms-chart.c (end): Fix corrupted-file crash.  [#539178]



Modified:
   trunk/NEWS
   trunk/plugins/excel/ChangeLog
   trunk/plugins/excel/ms-chart.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Thu Jun 19 21:01:42 2008
@@ -37,6 +37,7 @@
 	* Handle foo.XLS as well as foo.xls.  [#510036]
 	* Fix OPT_RGW hang.  [#534132]
 	* Fix BESSELI and BESSELK aborts.  [#534475]
+	* Fix corrupted-xls-file problem.  [#539178]
 
 SeÃn de BÃrca:
 	* Move to tango based icons. [#450444]

Modified: trunk/plugins/excel/ms-chart.c
==============================================================================
--- trunk/plugins/excel/ms-chart.c	(original)
+++ trunk/plugins/excel/ms-chart.c	Thu Jun 19 21:01:42 2008
@@ -2848,11 +2848,13 @@
 					eseries->data [GOG_MS_DIM_VALUES].data = NULL;
 				} else
 					eseries->extra_dim = GOG_MS_DIM_LOW;
-				g_object_set (G_OBJECT (series),
-					"style", s->chartline_style[1],
-					NULL);
-				g_object_unref (s->chartline_style[1]);
-				s->chartline_style[1] = NULL;
+				if (s->chartline_style[1]) {
+					g_object_set (G_OBJECT (series),
+						      "style", s->chartline_style[1],
+						      NULL);
+					g_object_unref (s->chartline_style[1]);
+					s->chartline_style[1] = NULL;
+				}
 			}
 			for (i = k ; i < l; i++ ) {
 				eseries = g_ptr_array_index (s->series, i);