PR other/43838

[pf3gnuchains/pf3gnuchains4x.git] / libiberty / cp-demangle.c

diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index 6db1f78..d2d15e9 100644 (file)
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -302,6 +302,8 @@ struct d_print_info
   /* The current index into any template argument packs we are using
      for printing.  */
   int pack_index;
+  /* Number of d_print_flush calls so far.  */
+  unsigned long int flush_count;
 };
 
 #ifdef CP_DEMANGLE_DEBUG
@@ -3285,6 +3287,7 @@ d_print_init (struct d_print_info *dpi, int options,
   dpi->last_char = '\0';
   dpi->templates = NULL;
   dpi->modifiers = NULL;
+  dpi->flush_count = 0;
 
   dpi->callback = callback;
   dpi->opaque = opaque;
@@ -3314,6 +3317,7 @@ d_print_flush (struct d_print_info *dpi)
   dpi->buf[dpi->len] = '\0';
   dpi->callback (dpi->buf, dpi->len, dpi->opaque);
   dpi->len = 0;
+  dpi->flush_count++;
 }
 
 /* Append characters and buffers for printing.  */
@@ -4047,12 +4051,18 @@ d_print_comp (struct d_print_info *dpi,
       if (d_right (dc) != NULL)
        {
          size_t len;
+         unsigned long int flush_count;
+         /* Make sure ", " isn't flushed by d_append_string, otherwise
+            dpi->len -= 2 wouldn't work.  */
+         if (dpi->len >= sizeof (dpi->buf) - 2)
+           d_print_flush (dpi);
          d_append_string (dpi, ", ");
          len = dpi->len;
+         flush_count = dpi->flush_count;
          d_print_comp (dpi, d_right (dc));
          /* If that didn't print anything (which can happen with empty
             template argument packs), remove the comma and space.  */
-         if (dpi->len == len)
+         if (dpi->flush_count == flush_count && dpi->len == len)
            dpi->len -= 2;
        }
       return;