Backport r246903

2017-05-29  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2017-04-13  Martin Liska  <mliska@suse.cz>

	PR gcov-profile/80413
	* gcov-io.c (gcov_write_string): Copy to buffer just when
	allocated size is greater than zero.

From-SVN: r248565

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8eca3975c6290ece703a115468955d4c997530b7..78389055a72f351845ee71aea8b44583b73786b8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2017-05-29  Martin Liska  <mliska@suse.cz>
+
+       Backport from mainline
+       2017-04-13  Martin Liska  <mliska@suse.cz>
+
+       PR gcov-profile/80413
+       * gcov-io.c (gcov_write_string): Copy to buffer just when
+       allocated size is greater than zero.
+
 2017-05-29  Martin Liska  <mliska@suse.cz>
 
        Backport from mainline

diff --git a/gcc/gcov-io.c b/gcc/gcov-io.c
index cbd0a9f1471c2b2f0e6166ae84c72b3478448d9b..9044aec6fe6da95ad1888fc91c647a9d9046092d 100644 (file)
--- a/gcc/gcov-io.c
+++ b/gcc/gcov-io.c
@@ -372,8 +372,12 @@ gcov_write_string (const char *string)
   buffer = gcov_write_words (1 + alloc);
 
   buffer[0] = alloc;
-  buffer[alloc] = 0;
-  memcpy (&buffer[1], string, length);
+
+  if (alloc > 0)
+    {
+      buffer[alloc] = 0; /* place nul terminators.  */
+      memcpy (&buffer[1], string, length);
+    }
 }
 #endif