gnumeric r16482 - in trunk: . plugins/excel

[mortenw svn gnome org]

Author: mortenw
Date: Sat Mar 29 13:03:27 2008
New Revision: 16482
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16482&view=rev

Log:
2008-03-29  Morten Welinder  <terra gnome org>

	* ms-formula-read.c (excel_parse_formula1): Fix swapped length
	checks.  Fixes #524926.



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

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sat Mar 29 13:03:27 2008
@@ -58,6 +58,7 @@
 	* Don't allow entry of invalid formats for cells.  [#521849]
 	* Fix SUMIF problems.  [#523250]
 	* Allow opening multiple files in open dialog.  [#524479]
+	* Fix check for bogus xls files.  [#524926]
 
 Nick Lamb:
 	* Honour detachable-toolbar preference.  [#321867]

Modified: trunk/plugins/excel/ms-formula-read.c
==============================================================================
--- trunk/plugins/excel/ms-formula-read.c	(original)
+++ trunk/plugins/excel/ms-formula-read.c	Sat Mar 29 13:03:27 2008
@@ -936,10 +936,10 @@
 			GnmCellPos top_left;
 
 			if (ver >= MS_BIFF_V3) {
-				CHECK_FORMULA_LEN(3);
+				CHECK_FORMULA_LEN(4);
 				top_left.col = GSF_LE_GET_GUINT16 (cur+2);
 			} else {
-				CHECK_FORMULA_LEN(4);
+				CHECK_FORMULA_LEN(3);
 				top_left.col = GSF_LE_GET_GUINT8 (cur+2);
 			}
 			top_left.row = GSF_LE_GET_GUINT16 (cur+0);
@@ -979,10 +979,10 @@
 			GnmCellPos top_left;
 
 			if (ver >= MS_BIFF_V3) {
-				CHECK_FORMULA_LEN(3);
+				CHECK_FORMULA_LEN(4);
 				top_left.col = GSF_LE_GET_GUINT16 (cur+2);
 			} else {
-				CHECK_FORMULA_LEN(4);
+				CHECK_FORMULA_LEN(3);
 				top_left.col = GSF_LE_GET_GUINT8 (cur+2);
 			}
 			top_left.row = GSF_LE_GET_GUINT16 (cur+0);