X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=format_check.c;h=bbb47e3579d4812160da14c1a45e20a2f50e69f6;hb=1b1b7cdc86ac07b9b79bfeb201a23d048aefcae6;hp=37d259889c44277d3707851779f469cc17a07825;hpb=7fdc2c1b75a824a1ec220a96f11ccd3d5359ba97;p=cparser diff --git a/format_check.c b/format_check.c index 37d2598..bbb47e3 100644 --- a/format_check.c +++ b/format_check.c @@ -21,12 +21,14 @@ #include +#include "adt/strutil.h" #include "adt/util.h" #include "format_check.h" #include "symbol_t.h" #include "ast_t.h" #include "entity_t.h" #include "diagnostic.h" +#include "parser.h" #include "types.h" #include "type_t.h" #include "warning.h" @@ -92,7 +94,7 @@ static const char* get_length_modifier_name(const format_length_modifier_t mod) return names[mod]; } -static void warn_invalid_length_modifier(const source_position_t *pos, +static void warn_invalid_length_modifier(const position_t *pos, const format_length_modifier_t mod, const utf32 conversion) { @@ -107,7 +109,7 @@ static int internal_check_printf_format(const expression_t *fmt_expr, const call_argument_t *arg, const format_spec_t *spec) { - while (fmt_expr->kind == EXPR_UNARY_CAST_IMPLICIT) { + while (fmt_expr->kind == EXPR_UNARY_CAST) { fmt_expr = fmt_expr->unary.value; } @@ -125,15 +127,14 @@ static int internal_check_printf_format(const expression_t *fmt_expr, return nt > nf ? nt : nf; } - if (fmt_expr->kind != EXPR_STRING_LITERAL - && fmt_expr->kind != EXPR_WIDE_STRING_LITERAL) + if (fmt_expr->kind != EXPR_STRING_LITERAL) return -1; - const char *string = fmt_expr->literal.value.begin; - size_t size = fmt_expr->literal.value.size; + const char *string = fmt_expr->string_literal.value.begin; + size_t size = fmt_expr->string_literal.value.size; const char *c = string; - const source_position_t *pos = &fmt_expr->base.source_position; + const position_t *pos = &fmt_expr->base.pos; unsigned num_fmt = 0; unsigned num_args = 0; char fmt; @@ -142,10 +143,6 @@ static int internal_check_printf_format(const expression_t *fmt_expr, continue; fmt = *(++c); - if (fmt == '\0') { - warningf(WARN_FORMAT, pos, "dangling %% in format string"); - break; - } if (fmt == '%') continue; @@ -320,6 +317,10 @@ break_fmt_flags: break; } + if (fmt == '\0') { + warningf(WARN_FORMAT, pos, "dangling %% in format string"); + break; + } type_t *expected_type; type_qualifiers_t expected_qual = TYPE_QUALIFIER_NONE; @@ -520,7 +521,7 @@ too_few_args: } } else if (get_unqualified_type(arg_skip) == expected_type_skip) { goto next_arg; - } else if (arg->expression->kind == EXPR_UNARY_CAST_IMPLICIT) { + } else if (arg->expression->kind == EXPR_UNARY_CAST) { expression_t const *const expr = arg->expression->unary.value; type_t *const unprom_type = skip_typeref(expr->base.type); if (get_unqualified_type(unprom_type) == expected_type_skip) { @@ -531,9 +532,9 @@ too_few_args: } } if (is_type_valid(arg_skip)) { - source_position_t const *const apos = &arg->expression->base.source_position; - char const *const mod = get_length_modifier_name(fmt_mod); - warningf(WARN_FORMAT, apos, "argument type '%T' does not match conversion specifier '%%%s%c' at position %u", arg_type, mod, (char)fmt, num_fmt); + position_t const *const apos = &arg->expression->base.pos; + char const *const mod = get_length_modifier_name(fmt_mod); + warningf(WARN_FORMAT, apos, "conversion '%%%s%c' at position %u specifies type '%T' but the argument has type '%T'", mod, (char)fmt, num_fmt, expected_type, arg_type); } } next_arg: @@ -574,7 +575,7 @@ static void check_printf_format(call_argument_t const *arg, for (; arg != NULL; arg = arg->next) ++num_args; if (num_args > (size_t)num_fmt) { - source_position_t const *const pos = &fmt_expr->base.source_position; + position_t const *const pos = &fmt_expr->base.pos; warningf(WARN_FORMAT, pos, "%u argument%s but only %u format specifier%s", num_args, num_args != 1 ? "s" : "", num_fmt, num_fmt != 1 ? "s" : ""); } } @@ -594,23 +595,22 @@ static void check_scanf_format(const call_argument_t *arg, } const expression_t *fmt_expr = arg->expression; - if (fmt_expr->kind == EXPR_UNARY_CAST_IMPLICIT) { + if (fmt_expr->kind == EXPR_UNARY_CAST) { fmt_expr = fmt_expr->unary.value; } - if (fmt_expr->kind != EXPR_STRING_LITERAL - && fmt_expr->kind != EXPR_WIDE_STRING_LITERAL) + if (fmt_expr->kind != EXPR_STRING_LITERAL) return; - const char *string = fmt_expr->literal.value.begin; - size_t size = fmt_expr->literal.value.size; + const char *string = fmt_expr->string_literal.value.begin; + size_t size = fmt_expr->string_literal.value.size; const char *c = string; /* find the real args */ for (; idx < spec->arg_idx && arg != NULL; ++idx) arg = arg->next; - const source_position_t *pos = &fmt_expr->base.source_position; + const position_t *pos = &fmt_expr->base.pos; unsigned num_fmt = 0; char fmt; for (fmt = *c; fmt != '\0'; fmt = *(++c)) { @@ -628,6 +628,17 @@ static void check_scanf_format(const call_argument_t *arg, suppress_assignment = true; } + size_t width = 0; + if ('0' <= fmt && fmt <= '9') { + do { + width = width * 10 + (fmt - '0'); + fmt = *++c; + } while ('0' <= fmt && fmt <= '9'); + if (width == 0) { + warningf(WARN_FORMAT, pos, "field width is zero at format %u", num_fmt); + } + } + /* look for length modifiers */ format_length_modifier_t fmt_mod = FMT_MOD_NONE; switch (fmt) { @@ -765,9 +776,9 @@ static void check_scanf_format(const call_argument_t *arg, goto next_arg; } expected_type = type_wchar_t; - break; + goto check_c_width; - case 'c': + case 'c': { switch (fmt_mod) { case FMT_MOD_NONE: expected_type = type_char; break; case FMT_MOD_l: expected_type = type_wchar_t; break; @@ -777,7 +788,20 @@ static void check_scanf_format(const call_argument_t *arg, warn_invalid_length_modifier(pos, fmt_mod, fmt); goto next_arg; } + +check_c_width: + if (width == 0) + width = 1; + if (!suppress_assignment && arg != NULL) { + type_t *const type = skip_typeref(revert_automatic_type_conversion(arg->expression)); + if (is_type_array(type) && + type->array.size_constant && + width > type->array.size) { + warningf(WARN_FORMAT, pos, "target buffer '%T' is too small for %u characters at format %u", type, width, num_fmt); + } + } break; + } case 'S': if (fmt_mod != FMT_MOD_NONE) { @@ -788,7 +812,7 @@ static void check_scanf_format(const call_argument_t *arg, break; case 's': - case '[': + case '[': { switch (fmt_mod) { case FMT_MOD_NONE: expected_type = type_char; break; case FMT_MOD_l: expected_type = type_wchar_t; break; @@ -798,14 +822,26 @@ static void check_scanf_format(const call_argument_t *arg, warn_invalid_length_modifier(pos, fmt_mod, fmt); goto next_arg; } + + if (!suppress_assignment && + width != 0 && + arg != NULL) { + type_t *const type = skip_typeref(revert_automatic_type_conversion(arg->expression)); + if (is_type_array(type) && + type->array.size_constant && + width >= type->array.size) { + warningf(WARN_FORMAT, pos, "target buffer '%T' is too small for %u characters and \\0 at format %u", type, width, num_fmt); + } + } break; + } case 'p': if (fmt_mod != FMT_MOD_NONE) { warn_invalid_length_modifier(pos, fmt_mod, fmt); goto next_arg; } - expected_type = type_void_ptr; + expected_type = type_void; break; case 'n': { @@ -876,9 +912,9 @@ too_few_args: } error_arg_type: if (is_type_valid(arg_skip)) { - source_position_t const *const apos = &arg->expression->base.source_position; - char const *const mod = get_length_modifier_name(fmt_mod); - warningf(WARN_FORMAT, apos, "argument type '%T' does not match conversion specifier '%%%s%c' at position %u", arg_type, mod, (char)fmt, num_fmt); + position_t const *const apos = &arg->expression->base.pos; + char const *const mod = get_length_modifier_name(fmt_mod); + warningf(WARN_FORMAT, apos, "conversion '%%%s%c' at position %u specifies type '%T*' but the argument has type '%T'", mod, (char)fmt, num_fmt, expected_type, arg_type); } } next_arg: @@ -966,7 +1002,7 @@ void check_format(const call_expression_t *const call) */ const char *const name = entity->base.symbol->string; for (size_t i = 0; i < lengthof(builtin_table); ++i) { - if (strcmp(name, builtin_table[i].name) == 0) { + if (streq(name, builtin_table[i].name)) { switch (builtin_table[i].fmt_kind) { case FORMAT_PRINTF: check_printf_format(arg, &builtin_table[i]);