diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 9585438687f..3edf233af1a 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2020-02-07  Nick Clifton  <nickc@redhat.com>
+
+	* dwarf.c (display_debug_lines_decoded): Force a NUL termination
+	of the truncated file name.
+
 2020-02-06  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* objdump.c (print_jump_visualisation): New function.
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
 		{