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.

29 lines
977 B

  1. From 9bf998b5fcbcde1dea0e472dc1538abb97e9012e Mon Sep 17 00:00:00 2001
  2. From: Andreas Gruenbacher <agruen@gnu.org>
  3. Date: Mon, 12 Feb 2018 16:48:24 +0100
  4. Subject: [PATCH] Fix segfault with mangled rename patch
  5. http://savannah.gnu.org/bugs/?53132
  6. * src/pch.c (intuit_diff_type): Ensure that two filenames are specified
  7. for renames and copies (fix the existing check).
  8. ---
  9. src/pch.c | 3 ++-
  10. 1 file changed, 2 insertions(+), 1 deletion(-)
  11. diff --git a/src/pch.c b/src/pch.c
  12. index ff9ed2c..bc6278c 100644
  13. --- a/src/pch.c
  14. +++ b/src/pch.c
  15. @@ -974,7 +974,8 @@ intuit_diff_type (bool need_header, mode_t *p_file_type)
  16. if ((pch_rename () || pch_copy ())
  17. && ! inname
  18. && ! ((i == OLD || i == NEW) &&
  19. - p_name[! reverse] &&
  20. + p_name[reverse] && p_name[! reverse] &&
  21. + name_is_valid (p_name[reverse]) &&
  22. name_is_valid (p_name[! reverse])))
  23. {
  24. say ("Cannot %s file without two valid file names\n", pch_rename () ? "rename" : "copy");
  25. --
  26. 2.19.1