X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=format_check.c;h=59902485ed6924aa50f0ed0049a37395488c7c9b;hb=1789a2fe5989073d07da3b46f7ea95d40a0c46bf;hp=a2833231dc0c1f05f055d24e3ca0d18fb453a726;hpb=f38f49bed167836fb8b86b7b6dab1d4aa2111626;p=cparser

diff --git a/format_check.c b/format_check.c
index a283323..5990248 100644
--- a/format_check.c
+++ b/format_check.c
@@ -157,11 +157,11 @@ static void check_printf_format(const call_argument_t *arg, const format_spec_t
 {
 	/* find format arg */
 	unsigned idx = 0;
-	for (; idx < spec->fmt_idx && arg != NULL; ++idx)
+	for (; idx < spec->fmt_idx; ++idx) {
+		if (arg == NULL)
+			return;
 		arg = arg->next;
-
-	if (arg == NULL)
-		return;
+	}
 
 	const expression_t *fmt_expr = arg->expression;
 	if (fmt_expr->kind == EXPR_UNARY_CAST_IMPLICIT) {
@@ -518,6 +518,10 @@ eval_fmt_mod_unsigned:
 
 			default:
 				warningf(pos, "encountered unknown conversion specifier '%%%C' at position %u", (wint_t)fmt, num_fmt);
+				if (arg == NULL) {
+					warningf(pos, "too few arguments for format string");
+					return;
+				}
 				goto next_arg;
 		}
 
@@ -576,7 +580,7 @@ next_arg:
 		arg = arg->next;
 	}
 	if (!atend(&vchar)) {
-		warningf(pos, "format string contains NUL");
+		warningf(pos, "format string contains '\\0'");
 	}
 	if (arg != NULL) {
 		unsigned num_args = num_fmt;
@@ -597,8 +601,11 @@ static void check_scanf_format(const call_argument_t *arg, const format_spec_t *
 {
 	/* find format arg */
 	unsigned idx = 0;
-	for (; idx < spec->fmt_idx; ++idx)
+	for (; idx < spec->fmt_idx; ++idx) {
+		if (arg == NULL)
+			return;
 		arg = arg->next;
+	}
 
 	const expression_t *fmt_expr = arg->expression;
 	if (fmt_expr->kind == EXPR_UNARY_CAST_IMPLICIT) {
@@ -622,7 +629,7 @@ static void check_scanf_format(const call_argument_t *arg, const format_spec_t *
 		return;
 	}
 	/* find the real args */
-	for (; idx < spec->arg_idx; ++idx)
+	for (; idx < spec->arg_idx && arg != NULL; ++idx)
 		arg = arg->next;
 
 	const source_position_t *pos = &fmt_expr->base.source_position;
@@ -846,6 +853,10 @@ eval_fmt_mod_unsigned:
 
 			default:
 				warningf(pos, "encountered unknown conversion specifier '%%%C' at position %u", (wint_t)fmt, num_fmt);
+				if (arg == NULL) {
+					warningf(pos, "too few arguments for format string");
+					return;
+				}
 				goto next_arg;
 		}
 
@@ -891,7 +902,7 @@ next_arg:
 		arg = arg->next;
 	}
 	if (!atend(&vchar)) {
-		warningf(pos, "format string contains NUL");
+		warningf(pos, "format string contains '\\0'");
 	}
 	if (arg != NULL) {
 		unsigned num_args = num_fmt;
@@ -899,7 +910,7 @@ next_arg:
 			++num_args;
 			arg = arg->next;
 		}
-		warningf(pos, "%u argument%s but only %u format string%s",
+		warningf(pos, "%u argument%s but only %u format specifier%s",
 			num_args, num_args != 1 ? "s" : "",
 			num_fmt, num_fmt != 1 ? "s" : "");
 	}