[2.34] Fix dwarf.c build with GCC 10

Message ID CAMe9rOpdH_apzre9_o6QKFMW+PZPkL=k1o0fzBEUbqMDSgxodg@mail.gmail.com
State New
Headers show
Series
  • [2.34] Fix dwarf.c build with GCC 10
Related show

Commit Message

H.J. Lu via Binutils March 24, 2020, 12:14 p.m.
Hi Nick,

I am seeing the same error on Linux/x86-64 with GCC 10.  I'd like to
backport this patch to binutils 2.34.

-- 
H.J.

Comments

H.J. Lu via Binutils March 24, 2020, 3:18 p.m. | #1
Hi H.J.

> I am seeing the same error on Linux/x86-64 with GCC 10.  I'd like to

> backport this patch to binutils 2.34.


Please do.

Cheers
  Nick

Patch

From 0cc14d3b95555549dec4416cd7c21375815ea422 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Fri, 7 Feb 2020 12:49:42 +0000
Subject: [PATCH] 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)
---
 binutils/dwarf.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 35842f74b2..6ecfab5d5a 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
 		{
-- 
2.25.1