gnumeric r17151 - in trunk: . plugins/excel

[mortenw svn gnome org]

Author: mortenw
Date: Fri Feb 20 17:06:32 2009
New Revision: 17151
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17151&view=rev

Log:
2009-02-20  Morten Welinder  <terra gnome org>

	* ms-chart.c (chart_create_obj): Bullet proof.



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

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Fri Feb 20 17:06:32 2009
@@ -112,6 +112,7 @@
 	* Handle GTK+ deprecation issues.  [#572240]
 	* When ssconvert-ing a single-sheet workbook, don't complain the
 	exporter can handle only a single sheet.  [#572448]
+	* Fix xls crash for bogus file.  [#572515]
 
 --------------------------------------------------------------------------
 Gnumeric 1.9.3

Modified: trunk/plugins/excel/ms-chart.c
==============================================================================
--- trunk/plugins/excel/ms-chart.c	(original)
+++ trunk/plugins/excel/ms-chart.c	Fri Feb 20 17:06:32 2009
@@ -3171,8 +3171,11 @@
 static SheetObject *
 chart_create_obj  (MSContainer *container, MSObj *obj)
 {
-	return (NULL != container && NULL != container->parent)
-		? (container->parent->vtbl->create_obj) (container->parent, obj) : NULL;
+	return (container &&
+		container->parent &&
+		container->parent->vtbl->create_obj)
+		? container->parent->vtbl->create_obj (container->parent, obj)
+		: NULL;
 }
 
 static GnmExprTop const *

Modified: trunk/plugins/excel/ms-obj.c
==============================================================================
--- trunk/plugins/excel/ms-obj.c	(original)
+++ trunk/plugins/excel/ms-obj.c	Fri Feb 20 17:06:32 2009
@@ -1272,7 +1272,7 @@
 #endif
 
 	if (c->vtbl->create_obj != NULL)
-		obj->gnum_obj = (*c->vtbl->create_obj) (c, obj);
+		obj->gnum_obj = c->vtbl->create_obj (c, obj);
 
 	/* Chart, There should be a BOF next */
 	if (obj->excel_type == 0x5) {