From: Mark Andrews <marka@isc.org>
Date: Thu, 30 Apr 2009 06:30:27 +0000 (+0000)
Subject: Remove infinite loop in token_print_indent_concat().
X-Git-Tag: v4_2_0a1~76
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=62f6843db628274e875b6c3f8f087a54b879977a;p=thirdparty%2Fdhcp.git

Remove infinite loop in token_print_indent_concat().
---

diff --git a/RELNOTES b/RELNOTES
index a5efdbfc2..1f1d39a4d 100644
--- 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 f172cf76a..a95198d7d 100644
--- 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);