libgsf r1008 - in trunk: . tools

[mortenw svn gnome org]

Author: mortenw
Date: Sun Sep 28 18:21:09 2008
New Revision: 1008
URL: http://svn.gnome.org/viewvc/libgsf?rev=1008&view=rev

Log:
2008-09-28  Morten Welinder  <terra gnome org>

	* tools/gsf.c (ls_R): Handle NULL children.  Fixes #553861.



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/tools/gsf.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sun Sep 28 18:21:09 2008
@@ -6,6 +6,7 @@
 Morten:
 	* Work around sshfs bug.  [#509883]
 	* Support tar archives.
+	* Improve gsf support for broken archives.  [#553861]
 
 --------------------------------------------------------------------------
 libgsf 1.14.9

Modified: trunk/tools/gsf.c
==============================================================================
--- trunk/tools/gsf.c	(original)
+++ trunk/tools/gsf.c	Sun Sep 28 18:21:09 2008
@@ -143,8 +143,11 @@
 		int i;
 		for (i = 0 ; i < gsf_infile_num_children (infile) ; i++) {
 			GsfInput *child = gsf_infile_child_by_index (infile, i);
-			ls_R (child, new_prefix);
-			g_object_unref (child);
+			/* We can get NULL here in case of file corruption.  */
+			if (child) {
+				ls_R (child, new_prefix);
+				g_object_unref (child);
+			}
 		}
 	}