texinfo update (Fri Mar 24 19:22:01 EST 2006)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.580
retrieving revision 1.581
diff -u -r1.580 -r1.581
--- ChangeLog   21 Mar 2006 21:55:10 -0000      1.580
+++ ChangeLog   25 Mar 2006 00:14:53 -0000      1.581
@@ -1,3 +1,10 @@
+2006-03-24  Karl Berry  <address@hidden>
+
+       * makeinfo/html.c (escape_string): do not free the old string,
+       that is dangerous, only the caller should do it.
+       (add_link): escape the title string.
+       Report from Ralf Wildenhues, 17 Mar 2006 05:08:11 +0100.
+
 2006-03-21  Stepan Kasal  <address@hidden>
 
        * doc/texinfo.tex (\parseargusing, \finishparsearg): Use \argtorun
Index: makeinfo/html.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/html.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- makeinfo/html.c     15 May 2005 00:00:07 -0000      1.31
+++ makeinfo/html.c     25 Mar 2006 00:14:37 -0000      1.32
@@ -1,7 +1,7 @@
 /* html.c -- html-related utilities.
-   $Id: html.c,v 1.31 2005/05/15 00:00:07 karl Exp $
+   $Id: html.c,v 1.32 2006/03/25 00:14:37 karl Exp $
 
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -398,7 +398,7 @@
         }
     }
   while (string[i++]);
-  free (string);
+
   return newstring - newlen;
 }
 
@@ -587,11 +587,15 @@
 {
   if (nodename)
     {
+      char *escaped_nodename;
       add_html_elt ("<link ");
       add_word_args ("%s", attributes);
       add_word_args (" href=\"");
       add_anchor_name (nodename, 1);
-      add_word_args ("\" title=\"%s\">\n", nodename);
+      escaped_nodename = escape_string (nodename);
+      add_word_args ("\" title=\"%s\">\n", escaped_nodename);
+      if (escaped_nodename != nodename)
+        free (escaped_nodename);
     }
 }
 
P ChangeLog
P makeinfo/html.c