You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
24 lines
878 B
24 lines
878 B
commit f290f48a621867084884bfff87f8093c15195e6a |
|
Author: Andreas Gruenbacher <agruen@gnu.org> |
|
Date: Mon Feb 12 16:48:24 2018 +0100 |
|
|
|
Fix segfault with mangled rename patch |
|
|
|
http://savannah.gnu.org/bugs/?53132 |
|
* src/pch.c (intuit_diff_type): Ensure that two filenames are specified |
|
for renames and copies (fix the existing check). |
|
|
|
diff --git a/src/pch.c b/src/pch.c |
|
index ff9ed2c..bc6278c 100644 |
|
--- a/src/pch.c |
|
+++ b/src/pch.c |
|
@@ -974,7 +974,8 @@ intuit_diff_type (bool need_header, mode_t *p_file_type) |
|
if ((pch_rename () || pch_copy ()) |
|
&& ! inname |
|
&& ! ((i == OLD || i == NEW) && |
|
- p_name[! reverse] && |
|
+ p_name[reverse] && p_name[! reverse] && |
|
+ name_is_valid (p_name[reverse]) && |
|
name_is_valid (p_name[! reverse]))) |
|
{ |
|
say ("Cannot %s file without two valid file names\n", pch_rename () ? "rename" : "copy");
|
|
|