summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-12-20 16:34:48 +0000
committerMike Frysinger <vapier@gentoo.org>2006-12-20 16:34:48 +0000
commita5503537ea2a09a619f2a7b4588830da89c839ae (patch)
tree376fd29418f54152e9528cf8c71a956eed513dce /app-editors/nano/files
parentarm/ia64/s390/sh stable (diff)
downloadgentoo-2-a5503537ea2a09a619f2a7b4588830da89c839ae.tar.gz
gentoo-2-a5503537ea2a09a619f2a7b4588830da89c839ae.tar.bz2
gentoo-2-a5503537ea2a09a619f2a7b4588830da89c839ae.zip
Fix from upstream for segv when writing to non-existent dir.
(Portage version: 2.1.2_rc3-r8)
Diffstat (limited to 'app-editors/nano/files')
-rw-r--r--app-editors/nano/files/digest-nano-2.0.1-r13
-rw-r--r--app-editors/nano/files/nano-2.0.1-bad-path.patch17
2 files changed, 20 insertions, 0 deletions
diff --git a/app-editors/nano/files/digest-nano-2.0.1-r1 b/app-editors/nano/files/digest-nano-2.0.1-r1
new file mode 100644
index 000000000000..d2664d8e8d28
--- /dev/null
+++ b/app-editors/nano/files/digest-nano-2.0.1-r1
@@ -0,0 +1,3 @@
+MD5 8abe33be6816ad9acd17391806b42d92 nano-2.0.1.tar.gz 1299203
+RMD160 bce343f9f31c1cc63bd4b37a66fefcaa159a11cf nano-2.0.1.tar.gz 1299203
+SHA256 6af1a2081c6303008163719b9012b403b461fb07991b5603ac28a820494741e2 nano-2.0.1.tar.gz 1299203
diff --git a/app-editors/nano/files/nano-2.0.1-bad-path.patch b/app-editors/nano/files/nano-2.0.1-bad-path.patch
new file mode 100644
index 000000000000..e6547290cf68
--- /dev/null
+++ b/app-editors/nano/files/nano-2.0.1-bad-path.patch
@@ -0,0 +1,17 @@
+fix from upstream
+
+diff -ur nano-2.0.1/src/files.c nano-2.0.1-fixed/src/files.c
+--- nano-2.0.1/src/files.c 2006-11-09 21:47:11.000000000 -0500
++++ nano-2.0.1-fixed/src/files.c 2006-12-15 00:57:10.000000000 -0500
+@@ -1871,8 +1871,9 @@
+ if (append == OVERWRITE) {
+ char *full_answer = get_full_path(answer);
+ char *full_filename = get_full_path(openfile->filename);
+- bool different_name = (strcmp(full_answer,
+- full_filename) != 0);
++ bool different_name = (strcmp((full_answer == NULL) ?
++ answer : full_answer, (full_filename == NULL) ?
++ openfile->filename : full_filename) != 0);
+ struct stat st;
+ bool name_exists;
+