libgsf r959 - in trunk: . gsf

[mortenw svn gnome org]

Author: mortenw
Date: Fri Feb  8 03:34:16 2008
New Revision: 959
URL: http://svn.gnome.org/viewvc/libgsf?rev=959&view=rev

Log:
	(ole_init_info): Sanity check num_sbat too.



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/gsf/gsf-infile-msole.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Fri Feb  8 03:34:16 2008
@@ -10,6 +10,7 @@
 	* Improve sanity checks of ole properties.  [#404934]
 	* Enhance gsf (the program) to list all document properites.
 	* Fix endless loop with broken ole files.  [#513831]
+	* Fix memory allocation problem due to broken ole files.
 
 --------------------------------------------------------------------------
 libgsf 1.14.7

Modified: trunk/gsf/gsf-infile-msole.c
==============================================================================
--- trunk/gsf/gsf-infile-msole.c	(original)
+++ trunk/gsf/gsf-infile-msole.c	Fri Feb  8 03:34:16 2008
@@ -557,7 +557,7 @@
 	}
 
 	/* very rough heuristic, just in case */
-	if (num_bat < info->max_block) {
+	if (num_bat < info->max_block && info->num_sbat < info->max_block) {
 		info->bb.bat.num_blocks = num_bat * (info->bb.size / BAT_INDEX_SIZE);
 		info->bb.bat.block	= g_new0 (guint32, info->bb.bat.num_blocks);