Fix (hopefully temporary) for breakage caused by my 08-21 patch.
	* cpplex.c (_cpp_get_fresh_line):  Check for null buffer.
	(_cpp_lex_buffer):  Likewise.
	* cpptrad.c (_cpp_read_logical_line_trad):  Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70898 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/ChangeLog

+2003-08-28  Per Bothner  <per@bothner.com>
+
+	Fix (hopefully temporary) for breakage caused by my 08-21 patch.
+	* cpplex.c (_cpp_get_fresh_line):  Check for null buffer.
+	(_cpp_lex_buffer):  Likewise.
+	* cpptrad.c (_cpp_read_logical_line_trad):  Likewise.
+
 2003-08-28  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* config/s390/s390.md ("*mulsi3_sign"): New insn.

gcc/cpplex.c

@@ -694,6 +694,9 @@ _cpp_get_fresh_line (cpp_reader *pfile)
     {
       cpp_buffer *buffer = pfile->buffer;
 
+      if (buffer == NULL)
+	return false;
+
       if (!buffer->need_line)
 	return true;
 
@@ -759,7 +762,8 @@ _cpp_lex_direct (cpp_reader *pfile)
 
  fresh_line:
   result->flags = 0;
-  if (pfile->buffer->need_line)
+  buffer = pfile->buffer;
+  if (buffer == NULL || buffer->need_line)
     {
       if (!_cpp_get_fresh_line (pfile))
 	{
@@ -781,8 +785,8 @@ _cpp_lex_direct (cpp_reader *pfile)
       result->flags = BOL;
       if (pfile->state.parsing_args == 2)
 	result->flags |= PREV_WHITE;
+      buffer = pfile->buffer;
     }
-  buffer = pfile->buffer;
  update_tokens_line:
   result->line = pfile->line;
 

gcc/cpptrad.c

@@ -299,7 +299,8 @@ _cpp_read_logical_line_trad (cpp_reader *pfile)
 {
   do
     {
-      if (pfile->buffer->need_line && !_cpp_get_fresh_line (pfile))
+      if ((pfile->buffer == NULL || pfile->buffer->need_line)
+	  && !_cpp_get_fresh_line (pfile))
 	return false;
     }
   while (!_cpp_scan_out_logical_line (pfile, NULL) || pfile->state.skipping);