texinfo update (Sat Aug 7 18:22:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.368
retrieving revision 1.369
diff -c -r1.368 -r1.369
*** ChangeLog   2 Aug 2004 14:10:41 -0000       1.368
--- ChangeLog   7 Aug 2004 22:03:08 -0000       1.369
***************
*** 1,3 ****
--- 1,12 ----
+ 2004-08-07  Karl Berry  <address@hidden>
+ 
+       * info/echo-area.c (inform_in_echo_area): avoid buffer overrun.
+       Report from: Roman Werpachowski <address@hidden>,
+       7 Aug 2004 01:18:32 +0200.
+       
+       * info/echo-area.h (inform_in_echo_area): declare arg as const,
+       while we're at it.
+ 
  2004-08-02  Karl Berry  <address@hidden>
  
        * makeinfo/cmds.c (cm_acronym_or_abbr): use strchr, not index.
Index: info/echo-area.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/echo-area.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** info/echo-area.c    24 Jul 2004 18:12:38 -0000      1.4
--- info/echo-area.c    7 Aug 2004 22:03:08 -0000       1.5
***************
*** 1,5 ****
  /* echo-area.c -- how to read a line in the echo area.
!    $Id: echo-area.c,v 1.4 2004/07/24 18:12:38 karl Exp $
  
     Copyright (C) 1993, 1997, 1998, 1999, 2001, 2004 Free Software
     Foundation, Inc.
--- 1,5 ----
  /* echo-area.c -- how to read a line in the echo area.
!    $Id: echo-area.c,v 1.5 2004/08/07 22:03:08 karl Exp $
  
     Copyright (C) 1993, 1997, 1998, 1999, 2001, 2004 Free Software
     Foundation, Inc.
***************
*** 1499,1511 ****
     for input or a couple of seconds, whichever comes first.  Then flush the
     informational message that was printed. */
  void
! inform_in_echo_area (char *message)
  {
!   register int i;
    char *text;
  
    text = xstrdup (message);
!   for (i = 0; text[i] && text[i] != '\n'; i++)
      ;
    text[i] = 0;
  
--- 1499,1512 ----
     for input or a couple of seconds, whichever comes first.  Then flush the
     informational message that was printed. */
  void
! inform_in_echo_area (const char *message)
  {
!   int i;
    char *text;
+   int avail = EA_MAX_INPUT + 1 - input_line_end;
  
    text = xstrdup (message);
!   for (i = 0; text[i] && text[i] != '\n' && i < avail; i++)
      ;
    text[i] = 0;
  
Index: info/echo-area.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/info/echo-area.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** info/echo-area.h    11 Apr 2004 17:56:45 -0000      1.3
--- info/echo-area.h    7 Aug 2004 22:03:08 -0000       1.4
***************
*** 1,5 ****
  /* echo-area.h -- Functions used in reading information from the echo area.
!    $Id: echo-area.h,v 1.3 2004/04/11 17:56:45 karl Exp $
  
     This file is part of GNU Info, a program for reading online documentation
     stored in Info format.
--- 1,5 ----
  /* echo-area.h -- Functions used in reading information from the echo area.
!    $Id: echo-area.h,v 1.4 2004/08/07 22:03:08 karl Exp $
  
     This file is part of GNU Info, a program for reading online documentation
     stored in Info format.
***************
*** 33,39 ****
     killed some text. */
  extern int echo_area_last_command_was_kill;
  
! extern void inform_in_echo_area (char *message);
  extern void echo_area_inform_of_deleted_window (WINDOW *window);
  extern void echo_area_prep_read (void);
  extern VFunction *ea_last_executed_command;
--- 33,39 ----
     killed some text. */
  extern int echo_area_last_command_was_kill;
  
! extern void inform_in_echo_area (const char *message);
  extern void echo_area_inform_of_deleted_window (WINDOW *window);
  extern void echo_area_prep_read (void);
  extern VFunction *ea_last_executed_command;
P ChangeLog
P info/echo-area.c
P info/echo-area.h