re PR preprocessor/69869 (internal compiler error: Segmentation fault in call to...

	PR preprocessor/69869
	* traditional.c (skip_macro_block_comment): Return bool, true if
	the macro block comment is unterminated.
	(copy_comment): Use return value from skip_macro_block_comment instead
	of always false.

	* gcc.dg/cpp/trad/pr69869.c: New test.

From-SVN: r257220

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 80cb48876e3870b2d4b733c5699965e463291ec3..ed44f5601ef212c104ed33264f3335fa138500eb 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2018-01-31  Jakub Jelinek  <jakub@redhat.com>
 
+       PR preprocessor/69869
+       * gcc.dg/cpp/trad/pr69869.c: New test.
+
        PR c/84100
        * gcc.dg/pr84100.c: New test.
 

diff --git a/gcc/testsuite/gcc.dg/cpp/trad/pr69869.c b/gcc/testsuite/gcc.dg/cpp/trad/pr69869.c
new file mode 100644 (file)
index 0000000..aa7aa83
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/trad/pr69869.c
@@ -0,0 +1,8 @@
+/* PR preprocessor/69869 */
+/* { dg-do preprocess } */
+/* { dg-options "-traditional-cpp" } */
+
+#define C(a,b)a/**/b
+C (foo/,**/)
+C (foo/,*)
+/* { dg-error "-:unterminated comment" "" {target "*-*-*"} .-1 } */

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index fdddd93f9aeee49f0c9e515446d2cb8c13e1f3af..9c675a52d0c760e891cc9086a7e443c98caabcbe 100644 (file)
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,11 @@
+2018-01-31  Jakub Jelinek  <jakub@redhat.com>
+
+       PR preprocessor/69869
+       * traditional.c (skip_macro_block_comment): Return bool, true if
+       the macro block comment is unterminated.
+       (copy_comment): Use return value from skip_macro_block_comment instead
+       of always false.
+
 2018-01-27  Jakub Jelinek  <jakub@redhat.com>
 
        * include/cpplib.h (enum cpp_builtin_type): Change BT_LAST_USER from

diff --git a/libcpp/traditional.c b/libcpp/traditional.c
index e07c96b63432634c495d392425661ce188337317..b25d5222d8a879cbeeb4982d01c907dca388be13 100644 (file)
--- a/libcpp/traditional.c
+++ b/libcpp/traditional.c
@@ -119,8 +119,11 @@ check_output_buffer (cpp_reader *pfile, size_t n)
 }
 
 /* Skip a C-style block comment in a macro as a result of -CC.
-   Buffer->cur points to the initial asterisk of the comment.  */
-static void
+   PFILE->buffer->cur points to the initial asterisk of the comment,
+   change it to point to after the '*' and '/' characters that terminate it.
+   Return true if the macro has not been termined, in that case set
+   PFILE->buffer->cur to the end of the buffer.  */
+static bool
 skip_macro_block_comment (cpp_reader *pfile)
 {
   const uchar *cur = pfile->buffer->cur;
@@ -131,10 +134,15 @@ skip_macro_block_comment (cpp_reader *pfile)
 
   /* People like decorating comments with '*', so check for '/'
      instead for efficiency.  */
-  while(! (*cur++ == '/' && cur[-2] == '*') )
-    ;
+  while (! (*cur++ == '/' && cur[-2] == '*'))
+    if (cur[-1] == '\n')
+      {
+       pfile->buffer->cur = cur - 1;
+       return true;
+      }
 
   pfile->buffer->cur = cur;
+  return false;
 }
 
 /* CUR points to the asterisk introducing a comment in the current
@@ -158,7 +166,7 @@ copy_comment (cpp_reader *pfile, const uchar *cur, int in_define)
 
   buffer->cur = cur;
   if (pfile->context->prev)
-    unterminated = false, skip_macro_block_comment (pfile);
+    unterminated = skip_macro_block_comment (pfile);
   else
     unterminated = _cpp_skip_block_comment (pfile);