summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Andrews <marka@isc.org>2009-04-30 06:36:39 +0000
committerMark Andrews <marka@isc.org>2009-04-30 06:36:39 +0000
commitcff09d12186e4b82c254cdf6cf417941b5452d1d (patch)
tree3a7b3745bb8bcdf0c56f586202ed0d1691815bea
parentfa7b1cfa912619431b880be30756a066b10e2f95 (diff)
downloadisc-dhcp-cff09d12186e4b82c254cdf6cf417941b5452d1d.tar.gz
Remove infinite loop in token_print_indent_concat().
-rw-r--r--RELNOTES2
-rw-r--r--common/print.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/RELNOTES b/RELNOTES
index 693c9a08..0c22bfef 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -54,6 +54,8 @@ suggested fixes to <dhcp-users@isc.org>.
Changes since 4.0.1
+- 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 f172cf76..a95198d7 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);