file-roller r2587 - in trunk: . src

[paobac svn gnome org]

Author: paobac
Date: Tue Feb 17 10:08:03 2009
New Revision: 2587
URL: http://svn.gnome.org/viewvc/file-roller?rev=2587&view=rev

Log:
2009-02-17  Paolo Bacchilega  <paobac svn gnome org>

	* src/fr-command-7z.c: 
	
	Fixed bug #571273 â crash in Archive Manager: Opening an archive 
	(ISO)
	Patch by Tom Parker.


Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/configure.ac
   trunk/src/fr-command-7z.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Tue Feb 17 10:08:03 2009
@@ -1,5 +1,5 @@
-version 2.25.2
---------------
+version 2.25.90
+---------------
 
 	New features and user visible changes:
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Feb 17 10:08:03 2009
@@ -2,7 +2,7 @@
 
 AC_PREREQ(2.61)
 
-AC_INIT(file-roller, 2.25.90, [http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller])
+AC_INIT(file-roller, 2.25.91, [http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller])
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
 AC_CONFIG_SRCDIR([config.h.in])

Modified: trunk/src/fr-command-7z.c
==============================================================================
--- trunk/src/fr-command-7z.c	(original)
+++ trunk/src/fr-command-7z.c	Tue Feb 17 10:08:03 2009
@@ -166,7 +166,8 @@
 		char **modified_fields;
 
 		modified_fields = g_strsplit (fields[1], " ", 2);
-		fdata->modified = mktime_from_string (modified_fields[0], modified_fields[1]);
+		if (modified_fields[0] != NULL)
+			fdata->modified = mktime_from_string (modified_fields[0], modified_fields[1]);
 		g_strfreev (modified_fields);
 	}
 	else if (strcmp (fields[0], "Encrypted") == 0) {