gnumeric r17219 - in trunk: . plugins/openoffice

[mortenw svn gnome org]

Author: mortenw
Date: Tue Mar 17 20:18:35 2009
New Revision: 17219
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17219&view=rev

Log:
2009-03-17  Morten Welinder  <terra gnome org>

	* openoffice-read.c (oo_filter_cond): Fix crash #575600.



Modified:
   trunk/NEWS
   trunk/plugins/openoffice/ChangeLog
   trunk/plugins/openoffice/openoffice-read.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Tue Mar 17 20:18:35 2009
@@ -40,6 +40,7 @@
 	* Fix string problem with broken xls.  [#575452]
 	* Improve date entry for locales that end abbreviated month names
 	with punctuation.
+	* Fix ODS crash.  [#575600]
 
 Sum1:
 	* Implement OOO probing.  [#574381]

Modified: trunk/plugins/openoffice/openoffice-read.c
==============================================================================
--- trunk/plugins/openoffice/openoffice-read.c	(original)
+++ trunk/plugins/openoffice/openoffice-read.c	Tue Mar 17 20:18:35 2009
@@ -1934,7 +1934,7 @@
 		case GNM_FILTER_OP_BOTTOM_N:
 		case GNM_FILTER_OP_TOP_N_PERCENT:
 		case GNM_FILTER_OP_TOP_N:
-			if (VALUE_IS_NUMBER(v))
+			if (v && VALUE_IS_NUMBER(v))
 				cond = gnm_filter_condition_new_bucket (
 					0 == (op & GNM_FILTER_OP_BOTTOM_MASK),
 					0 == (op & GNM_FILTER_OP_PERCENT_MASK),