0001-Fix-segfault-with-mangled-rename-patch.patch 1.1 KB

123456789101112131415161718192021222324252627282930313233
  1. From f290f48a621867084884bfff87f8093c15195e6a 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. Signed-off-by: Baruch Siach <baruch@tkos.co.il>
  9. ---
  10. Patch status: upstream commit f290f48a6218
  11. src/pch.c | 3 ++-
  12. 1 file changed, 2 insertions(+), 1 deletion(-)
  13. diff --git a/src/pch.c b/src/pch.c
  14. index ff9ed2cebb8a..bc6278c4032c 100644
  15. --- a/src/pch.c
  16. +++ b/src/pch.c
  17. @@ -974,7 +974,8 @@ intuit_diff_type (bool need_header, mode_t *p_file_type)
  18. if ((pch_rename () || pch_copy ())
  19. && ! inname
  20. && ! ((i == OLD || i == NEW) &&
  21. - p_name[! reverse] &&
  22. + p_name[reverse] && p_name[! reverse] &&
  23. + name_is_valid (p_name[reverse]) &&
  24. name_is_valid (p_name[! reverse])))
  25. {
  26. say ("Cannot %s file without two valid file names\n", pch_rename () ? "rename" : "copy");
  27. --
  28. 2.16.1