gnumeric r16483 - in branches/gnumeric-1-8: . plugins/excel

[mortenw svn gnome org]

Author: mortenw
Date: Sat Mar 29 13:05:04 2008
New Revision: 16483
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16483&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:
   branches/gnumeric-1-8/NEWS
   branches/gnumeric-1-8/plugins/excel/ChangeLog
   branches/gnumeric-1-8/plugins/excel/ms-formula-read.c

Modified: branches/gnumeric-1-8/NEWS
==============================================================================
--- branches/gnumeric-1-8/NEWS	(original)
+++ branches/gnumeric-1-8/NEWS	Sat Mar 29 13:05:04 2008
@@ -6,6 +6,7 @@
 Morten:
 	* Fix SUMIF problems.  [#523250]
 	* Allow opening multiple files in open dialog.  [#524479]
+	* Fix check for bogus xls files.  [#524926]
 
 --------------------------------------------------------------------------
 Gnumeric 1.8.2

Modified: branches/gnumeric-1-8/plugins/excel/ms-formula-read.c
==============================================================================
--- branches/gnumeric-1-8/plugins/excel/ms-formula-read.c	(original)
+++ branches/gnumeric-1-8/plugins/excel/ms-formula-read.c	Sat Mar 29 13:05:04 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);