r19017 - in /desktop/unstable/gvfs/debian: changelog patches/02_http_unescape.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Mar 14 17:52:44 2009
New Revision: 19017

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19017
Log:
02_http_unescape.patch: new patch, stolen upstream. Fix escaping of 
HTTP uris that leads to a crash. Closes: #519722.

Added:
    desktop/unstable/gvfs/debian/patches/02_http_unescape.patch
Modified:
    desktop/unstable/gvfs/debian/changelog
    desktop/unstable/gvfs/debian/patches/series

Modified: desktop/unstable/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/changelog?rev=19017&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog (original)
+++ desktop/unstable/gvfs/debian/changelog Sat Mar 14 17:52:44 2009
@@ -1,3 +1,10 @@
+gvfs (1.0.3-3) unstable; urgency=low
+
+  * 02_http_unescape.patch: new patch, stolen upstream. Fix escaping of 
+    HTTP uris that leads to a crash. Closes: #519722.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 14 Mar 2009 18:50:49 +0100
+
 gvfs (1.0.3-2) unstable; urgency=low
 
   * Upload to unstable.

Added: desktop/unstable/gvfs/debian/patches/02_http_unescape.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/02_http_unescape.patch?rev=19017&op=file
==============================================================================
--- desktop/unstable/gvfs/debian/patches/02_http_unescape.patch (added)
+++ desktop/unstable/gvfs/debian/patches/02_http_unescape.patch Sat Mar 14 17:52:44 2009
@@ -1,0 +1,80 @@
+Debian #519722
+GNOME #546256
+Upstream commit r2222
+
+Index: gvfs-1.0.3/client/httpuri.c
+===================================================================
+--- gvfs-1.0.3.orig/client/httpuri.c	2009-03-14 18:49:42.556724573 +0100
++++ gvfs-1.0.3/client/httpuri.c	2009-03-14 18:49:54.613532771 +0100
+@@ -79,44 +79,30 @@ http_from_uri (GVfsUriMapper *mapper,
+                const char     *uri_str)
+ {
+   GVfsUriMountInfo *info;
+-  char *path;
+   gboolean ssl;
++  GDecodedUri *uri;
+ 
+-  path = NULL;
+-  if (!g_ascii_strncasecmp (uri_str, "http", 4))
+-    {
+-      GDecodedUri *uri;
++  uri = g_vfs_decode_uri (uri_str);
+ 
+-      uri = g_vfs_decode_uri (uri_str);
++  if (uri == NULL)
++    return NULL;
+ 
++  if (!g_ascii_strncasecmp (uri->scheme, "http", 4))
++    {
+       info = g_vfs_uri_mount_info_new ("http");
+       g_vfs_uri_mount_info_set (info, "uri", uri_str);
+-      
+-      if (uri)
+-        {
+-          path = uri->path;
+-          uri->path = NULL;
+-          g_vfs_decoded_uri_free (uri);
+-        }
+     }
+   else
+     {
+-      GDecodedUri *uri;
+-
+-      uri = g_vfs_decode_uri (uri_str);
+-
+-      if (uri == NULL)
+-          return NULL;
+-
+       info = g_vfs_uri_mount_info_new ("dav");
+       ssl = !g_ascii_strcasecmp (uri->scheme, "davs");
+       g_vfs_uri_mount_info_set (info, "ssl", ssl ? "true" : "false");
+ 
+       if (uri->host && *uri->host)
+-          g_vfs_uri_mount_info_set (info, "host", uri->host);
++        g_vfs_uri_mount_info_set (info, "host", uri->host);
+ 
+       if (uri->userinfo && *uri->userinfo)
+-          g_vfs_uri_mount_info_set (info, "user", uri->userinfo);
++        g_vfs_uri_mount_info_set (info, "user", uri->userinfo);
+ 
+       /* only set the port if it isn't the default port */
+       if (uri->port != -1 && ! port_is_defaul_port (uri->port, ssl))
+@@ -125,15 +111,12 @@ http_from_uri (GVfsUriMapper *mapper,
+           g_vfs_uri_mount_info_set (info, "port", port);
+           g_free (port);
+         }
+-
+-      path = uri->path;
+-      uri->path = NULL;
+-      
+-      g_vfs_decoded_uri_free (uri);
+     }
+ 
++  info->path = uri->path;
++  uri->path = NULL;
++  g_vfs_decoded_uri_free (uri);
+ 
+-  info->path = path;
+   return info;
+ }
+ 

Modified: desktop/unstable/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/series?rev=19017&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/series (original)
+++ desktop/unstable/gvfs/debian/patches/series Sat Mar 14 17:52:44 2009
@@ -1,3 +1,4 @@
 01_maintainer_mode.patch
+02_http_unescape.patch
 90_relibtoolize.patch
 99_ltmain_as-needed.patch