From f1901833ef4095e5f4925a930bcdf5730b589029 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Oct 31 2012 14:26:55 +0000
Subject: add fix for bz870485


---

diff --git a/fuse-3c4c063a2fd5cc6e9ce2b5db82e2a0dfa59b2e40.patch b/fuse-3c4c063a2fd5cc6e9ce2b5db82e2a0dfa59b2e40.patch
new file mode 100644
index 0000000..1603a86
--- /dev/null
+++ b/fuse-3c4c063a2fd5cc6e9ce2b5db82e2a0dfa59b2e40.patch
@@ -0,0 +1,14 @@
+diff --git a/lib/fuse.c b/lib/fuse.c
+index 644878b..3c7f642 100644
+--- a/lib/fuse.c
++++ b/lib/fuse.c
+@@ -1162,7 +1162,7 @@ static int try_get_path2(struct fuse *f, fuse_ino_t nodeid1, const char *name1,
+ 			struct node *wn1 = wnode1 ? *wnode1 : NULL;
+ 
+ 			unlock_path(f, nodeid1, wn1, NULL, ticket);
+-			free(path1);
++			free(*path1);
+ 			if (ticket && err != -EAGAIN)
+ 				release_tickets(f, nodeid1, wn1, ticket);
+ 		}
+
diff --git a/fuse.spec b/fuse.spec
index 9955c04..a2b95a3 100644
--- a/fuse.spec
+++ b/fuse.spec
@@ -1,6 +1,6 @@
 Name:           fuse
 Version:        2.8.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        File System in Userspace (FUSE) utilities
 
 Group:          System Environment/Base
@@ -10,6 +10,10 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
 Source1:	%{name}.conf
 
 Patch1:		fuse-0001-More-parentheses.patch
+# Apply upstream fix for BZ#870485
+# http://fuse.git.sourceforge.net/git/gitweb.cgi?p=fuse/fuse;a=commit;h=3c4c063a2fd5cc6e9ce2b5db82e2a0dfa59b2e40
+Patch3:         fuse-3c4c063a2fd5cc6e9ce2b5db82e2a0dfa59b2e40.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       kernel >= 2.6.14
 Requires:       which
@@ -54,6 +58,7 @@ pgk-config) to develop FUSE based applications/filesystems.
 #disable device creation during build/install
 sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in
 %patch1 -p1 -b .add_parentheses
+%patch3 -p1 -b .bz870485
 
 %build
 # Can't pass --disable-static here, or else the utils don't build
@@ -118,6 +123,9 @@ fi
 %{_includedir}/fuse
 
 %changelog
+* Wed Oct 31 2012 Tom Callaway <spot@fedoraproject.org> - 2.8.7-2
+- apply upstream fix for crash caused by freeing a stack address (bz870485)
+
 * Mon Apr 16 2012 Peter Lemenkov <lemenkov@gmail.com> - 2.8.7-1
 - Ver. 2.8.7