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

[mortenw svn gnome org]

Author: mortenw
Date: Sat Feb  9 02:48:40 2008
New Revision: 16368
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16368&view=rev

Log:
[#515336]



Modified:
   branches/gnumeric-1-8/NEWS
   branches/gnumeric-1-8/plugins/excel/ms-excel-read.c

Modified: branches/gnumeric-1-8/NEWS
==============================================================================
--- branches/gnumeric-1-8/NEWS	(original)
+++ branches/gnumeric-1-8/NEWS	Sat Feb  9 02:48:40 2008
@@ -10,7 +10,7 @@
 	  [#513317] [#513361] [#513364] [#513551] [#513605] [#513608] [#513790]
 	  [#513787] [#513835] [#513963] [#514229] [#514230] [#514295] [#514435]
 	  [#514436] [#514437] [#514506] [#514510] [#514630] [#514637] [#515155]
-	  [#515269] [#515275] [#515335]
+	  [#515269] [#515275] [#515335] [#515336]
 	* Fix non-ascii export problem.  [#511135]
 	* Band-aid evaluation problem with broken xls.  [#513559]
 	* Fix circular array formula problem.

Modified: branches/gnumeric-1-8/plugins/excel/ms-excel-read.c
==============================================================================
--- branches/gnumeric-1-8/plugins/excel/ms-excel-read.c	(original)
+++ branches/gnumeric-1-8/plugins/excel/ms-excel-read.c	Sat Feb  9 02:48:40 2008
@@ -2061,13 +2061,16 @@
 static void
 excel_read_XF_OLD (BiffQuery *q, GnmXLImporter *importer)
 {
-	BiffXFData *xf = g_new0 (BiffXFData, 1);
+	BiffXFData *xf;
 	guint16 data;
         guint8 subdata;
 
 	d ( 2, fprintf(stderr, "XF # %d\n", importer->XF_cell_records->len); );
 	d ( 2, gsf_mem_dump (q->data, q->length); );
 
+	XL_CHECK_CONDITION (q->length > (importer->ver >= MS_BIFF_V3 ? 12 : 4));
+
+	xf = g_new0 (BiffXFData, 1);
         xf->font_idx = q->data[0];
         xf->format_idx = (importer->ver >= MS_BIFF_V3)
 		? q->data[1] : (q->data[2] & 0x3f);