Remove infinite loop in token_print_indent_concat().

diff --git a/RELNOTES b/RELNOTES
index a5efdbfc279acb60c345374458422180f929dda2..1f1d39a4dfaa12296650896952230df5a561ad1e 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -51,6 +51,8 @@ work on other platforms. Please report any problems and suggested fixes to
 
                        Changes since 4.1.0 (bug fixes)
 
+- Remove infinite loop in token_print_indent_concat().
+
 - Validate the argument to the -p option.
 
 - The notorious 'option <unknown> ... larger than buffer' log line,

diff --git a/common/print.c b/common/print.c
index f172cf76a3e081555d0459e9c35ce5f50dee50e7..a95198d7d90f14859d6945b9943265506a8c08d9 100644 (file)
--- a/common/print.c
+++ b/common/print.c
@@ -1108,6 +1108,7 @@ int token_print_indent_concat (FILE *file, int col,  int indent,
                len = strlen (s);
                strcpy (u, s);
                u += len;
+               s = va_arg (list, char *);
        }
        va_end (list);