[maemo-commits] [maemo-commits] r14236 - in projects/haf/trunk/osso-gnome-vfs2/debian: . patches

[From: subversion at stage.maemo.org]

Author: richard
Date: 2007-10-01 16:23:58 +0300 (Mon, 01 Oct 2007)
New Revision: 14236

Added:
   projects/haf/trunk/osso-gnome-vfs2/debian/patches/40-http-module-redirect-crash.patch
Modified:
   projects/haf/trunk/osso-gnome-vfs2/debian/changelog
Log:
Prepare for release.

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-10-01 13:13:35 UTC (rev 14235)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-10-01 13:23:58 UTC (rev 14236)
@@ -1,3 +1,9 @@
+osso-gnome-vfs2 (2.16.3-1osso31) unstable; urgency=low
+
+  * Fixes: NB#71470, Crash in gnome-vfs
+	
+ -- Richard Hult <richard at imendio.com>  Mon,  1 Oct 2007 14:57:16 +0200
+
 osso-gnome-vfs2 (2.16.3-1osso30) unstable; urgency=low
 
   * Remove debug output from the http module

Added: projects/haf/trunk/osso-gnome-vfs2/debian/patches/40-http-module-redirect-crash.patch
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/patches/40-http-module-redirect-crash.patch	2007-10-01 13:13:35 UTC (rev 14235)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/patches/40-http-module-redirect-crash.patch	2007-10-01 13:23:58 UTC (rev 14236)
@@ -0,0 +1,16 @@
+--- modules/http-neon-method.c-unmod	2007-10-01 11:48:39.000000000 +0200
++++ modules/http-neon-method.c	2007-10-01 14:54:43.000000000 +0200
+@@ -1791,6 +1791,13 @@
+ 	new_uri = gnome_vfs_uri_new (redir_texturi);
+ 	
+ 	NE_FREE (redir_texturi);
++
++	/* This happens if we are redirected to an unsupported scheme
++	 * (http->https when https is not installed, for instance).
++	 */
++	if (new_uri == NULL) {
++		return GNOME_VFS_ERROR_NOT_SUPPORTED;
++	}
+ 	
+ 	/* see if redirect is to another host:port pair so we need a new
+ 	 * connection/session */