svn commit: r259272 - stable/9/contrib/gcclibs/libcpp

[Pedro F. Giffuni]

Author: pfg
Date: Thu Dec 12 19:02:18 2013
New Revision: 259272
URL: http://svnweb.freebsd.org/changeset/base/259272

Log:
  MFC r258712;
  
  libcpp: fix an underflow.
  
  Similar fix seen in Apple's gcc42.
  
  Obtained from:	OpenBSD (Rev 1.2)
  MFC after:	2 weeks

Modified:
  stable/9/contrib/gcclibs/libcpp/charset.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/contrib/gcclibs/   (props changed)

Modified: stable/9/contrib/gcclibs/libcpp/charset.c
==============================================================================
--- stable/9/contrib/gcclibs/libcpp/charset.c	Thu Dec 12 19:01:50 2013	(r259271)
+++ stable/9/contrib/gcclibs/libcpp/charset.c	Thu Dec 12 19:02:18 2013	(r259272)
@@ -1628,7 +1628,7 @@ _cpp_convert_input (cpp_reader *pfile, c
      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 > 0 && to.text[to.len - 1] == '\r')
     to.text[to.len] = '\r';
   else
     to.text[to.len] = '\n';