Ticket #6329: makeinfo-strcpy-overlap.patch

makeinfo.c

@@ -1 +1 @@
 /* Makeinfo -- convert Texinfo source files into Info files.
-   $Id: makeinfo.c,v 1.1 2004/10/28 18:14:10 zooey Exp $
+   $Id$
 
    Copyright (C) 1987, 92, 93, 94, 95, 96, 97, 98
    Free Software Foundation, Inc.
@@ -1672 +1672 @@
 void
 canon_white (string)
      char *string;
-{
+{ 
+  char *temp;
   int len = strlen (string);
   int x;
 
@@ -1683 +1684 @@
     {
       if (!cr_or_whitespace (string[x]))
         {
-          strcpy (string, string + x);
+          /* The destination may _not_ overlap ! -- strcpy (string, string + x); */
+          temp = malloc(len * sizeof(char) + 1);
+          strcpy(temp, string+x);
+          strcpy(string, temp);
+          free(temp);
           break;
         }
     }