re PR preprocessor/30001 (out-of-bounds access when processing empty file)

	PR preprocessor/30001:
	* charset.c (_cpp_convert_input): Check that to.len is greater
	than zero.

From-SVN: r120245

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index c189cd66b8766ace0d5491f3f6600887e66d8b8d..1b1f833b8d7eb7455ea86018baba9d6edb2d7a1d 100644 (file)
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-28  Tom Tromey  <tromey@redhat.com>
+
+       PR preprocessor/30001:
+       * charset.c (_cpp_convert_input): Check that to.len is greater
+       than zero.
+
 2006-11-20  Trevor Smigiel <Trevor_Smigiel@playstation.sony.com>
 
        * configure.ac (need_64bit_hwint): Need 64bit hwint for SPU.

diff --git a/libcpp/charset.c b/libcpp/charset.c
index 78c89816735ac0beab0bc02db904c8421e26ac62..d1323601bd1ace0ace4bd9ce935e10cb6a531e6c 100644 (file)
--- a/libcpp/charset.c
+++ b/libcpp/charset.c
@@ -1,5 +1,5 @@
 /* CPP Library - charsets
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006
    Free Software Foundation, Inc.
 
    Broken out of c-lex.c Apr 2003, adding valid C99 UCN ranges.
@@ -1628,7 +1628,7 @@ _cpp_convert_input (cpp_reader *pfile, const char *input_charset,
      terminate with another \r, not an \n, so that we do not mistake
      the \r\n sequence for a single DOS line ending and erroneously
      issue the "No newline at end of file" diagnostic.  */
-  if (to.text[to.len - 1] == '\r')
+  if (to.len && to.text[to.len - 1] == '\r')
     to.text[to.len] = '\r';
   else
     to.text[to.len] = '\n';