gnumeric r17071 - in trunk: . plugins/excel

[mortenw svn gnome org]

Author: mortenw
Date: Thu Jan 15 19:07:27 2009
New Revision: 17071
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17071&view=rev

Log:
2009-01-15  Morten Welinder  <terra gnome org>

	* ms-excel-read.c (excel_read_DELTA): Check tolerance.  Fixes
	#567823.
	(excel_read_CALCCOUNT): Check count.



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

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Thu Jan 15 19:07:27 2009
@@ -67,6 +67,7 @@
 	* Constify usage of GOFormats.
 	* Fix inconsistentcy in searching with respect to formats.
 	* Fix issue with BASE.   [#567252]
+	* Fix XLS import criticals.  [#567823]
 
 --------------------------------------------------------------------------
 Gnumeric 1.9.3

Modified: trunk/plugins/excel/ms-excel-read.c
==============================================================================
--- trunk/plugins/excel/ms-excel-read.c	(original)
+++ trunk/plugins/excel/ms-excel-read.c	Thu Jan 15 19:07:27 2009
@@ -4563,6 +4563,8 @@
 	XL_CHECK_CONDITION (q->length == 2);
 
 	count = GSF_LE_GET_GUINT16 (q->data);
+	XL_CHECK_CONDITION (count >= 0);
+
 	workbook_iteration_max_number (importer->wb, count);
 }
 
@@ -4582,6 +4584,8 @@
 	XL_CHECK_CONDITION (q->length == 8);
 
 	tolerance = gsf_le_get_double (q->data);
+	XL_CHECK_CONDITION (tolerance >= 0);
+
 	workbook_iteration_tolerance (importer->wb, tolerance);
 }