[Pkg-xfce-commits] r6218 - in goodies/trunk/squeeze/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-11-18 12:02:44 +0000 (Fri, 18 Nov 2011)
New Revision: 6218

Added:
   goodies/trunk/squeeze/debian/patches/03_fix_segfault_on_relative_paths.patch
Modified:
   goodies/trunk/squeeze/debian/changelog
   goodies/trunk/squeeze/debian/patches/series
Log:
* debian/patches:
  - 03_fix_segfault_on_relative_paths added, thanks to Ibragimov Rinat.
    Correctly handle path with '/' in them.          closes: #607483, #608005

Modified: goodies/trunk/squeeze/debian/changelog
===================================================================
--- goodies/trunk/squeeze/debian/changelog	2011-11-18 10:03:16 UTC (rev 6217)
+++ goodies/trunk/squeeze/debian/changelog	2011-11-18 12:02:44 UTC (rev 6218)
@@ -1,3 +1,11 @@
+squeeze (0.2.3-12) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 03_fix_segfault_on_relative_paths added, thanks to Ibragimov Rinat.
+      Correctly handle path with '/' in them.          closes: #607483, #608005
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 18 Nov 2011 12:58:09 +0100
+
 squeeze (0.2.3-11) unstable; urgency=low
 
   * debian/patches:

Added: goodies/trunk/squeeze/debian/patches/03_fix_segfault_on_relative_paths.patch
===================================================================
--- goodies/trunk/squeeze/debian/patches/03_fix_segfault_on_relative_paths.patch	                        (rev 0)
+++ goodies/trunk/squeeze/debian/patches/03_fix_segfault_on_relative_paths.patch	2011-11-18 12:02:44 UTC (rev 6218)
@@ -0,0 +1,19 @@
+diff --git a/libsqueeze/archive.c b/libsqueeze/archive.c
+--- a/libsqueeze/archive.c
++++ b/libsqueeze/archive.c
+@@ -175,8 +175,13 @@ lsq_archive_new(gchar *path, const gchar *mime)
+ 	{
+ 		if(g_path_is_absolute(path))
+ 			archive->path_info = thunar_vfs_path_new(path, NULL);
+-		else
+-			archive->path_info = thunar_vfs_path_relative(lsq_relative_base_path, path);
++		else {
++			gchar *current_dir = g_get_current_dir();
++			gchar *full_path = g_build_path("/", current_dir, path, NULL);
++			archive->path_info = thunar_vfs_path_new(full_path, NULL);
++			g_free(current_dir);
++			g_free(full_path);
++		}
+ 		archive->path = thunar_vfs_path_dup_string(archive->path_info);
+ 	}
+ 	else

Modified: goodies/trunk/squeeze/debian/patches/series
===================================================================
--- goodies/trunk/squeeze/debian/patches/series	2011-11-18 10:03:16 UTC (rev 6217)
+++ goodies/trunk/squeeze/debian/patches/series	2011-11-18 12:02:44 UTC (rev 6218)
@@ -1,2 +1,3 @@
 01_fix-format-string.patch
 02_fix-segfault-open-files.patch
+03_fix_segfault_on_relative_paths.patch