From: Nick Clifton <nickc@redhat.com>
Date: Fri, 7 Feb 2020 12:49:42 +0000 (+0000)
Subject: Fix dwarf.c build with GCC 10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6520be37fd59993c5b6bed1fe2a185fb7a1f996;p=thirdparty%2Fbinutils-gdb.git

Fix dwarf.c build with GCC 10

Silcence a compile time warning message building the binutils with
gcc-10.

	* dwarf.c (display_debug_lines_decoded): Force a NUL termination
	of the truncated file name.

(cherry picked from commit e1104d08fe2fbfabcfa98aa00525211e47548bd8)
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 24b0515fd68..fadd317151d 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2020-03-24  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf.c (display_debug_lines_decoded): Force a NUL termination
+	of the truncated file name.
+
 2020-02-25  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR binutils/25584
diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 35842f74b2e..6ecfab5d5a7 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -4905,6 +4905,11 @@ display_debug_lines_decoded (struct dwarf_section *  section,
 		  strncpy (newFileName,
 			   fileName + fileNameLength - MAX_FILENAME_LENGTH,
 			   MAX_FILENAME_LENGTH + 1);
+		  /* FIXME: This is to pacify gcc-10 which can warn that the
+		     strncpy above might leave a non-NUL terminated string
+		     in newFileName.  It won't, but gcc's analysis doesn't
+		     quite go far enough to discover this.  */
+		  newFileName[MAX_FILENAME_LENGTH] = 0;
 		}
 	      else
 		{