diff options
author | Andreas Gruenbacher <agruen@gnu.org> | 2018-02-12 16:48:24 +0100 |
---|---|---|
committer | Andreas Gruenbacher <agruen@gnu.org> | 2018-02-12 16:48:24 +0100 |
commit | f290f48a621867084884bfff87f8093c15195e6a (patch) | |
tree | 0788f18d9d6f663bbddf2f4c881284d21170516d | |
parent | 074e2395f81d0ecaa66b71a6c228c70b49db72e5 (diff) | |
download | patch-f290f48a621867084884bfff87f8093c15195e6a.tar.gz |
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).
-rw-r--r-- | src/pch.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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"); |