X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=format_check.c;h=4c1d6701f9067cfff8f4c8dcb01654c9de27383d;hb=287127a9ff31adbada4945a2e82cd4ab57786b85;hp=2a4cd6cb8c4438dc621bd1e6fddad6e6ed3076ed;hpb=51f2cef66ee8f9de8e68b13f473a5f213685b77b;p=cparser diff --git a/format_check.c b/format_check.c index 2a4cd6c..4c1d670 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" @@ -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,12 +127,11 @@ 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; @@ -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; @@ -472,8 +473,7 @@ eval_fmt_mod_unsigned: default: warningf(WARN_FORMAT, pos, "encountered unknown conversion specifier '%%%c' at position %u", fmt, num_fmt); if (arg == NULL) { - warningf(WARN_FORMAT, pos, "too few arguments for format string"); - return -1; + goto too_few_args; } goto next_arg; } @@ -494,6 +494,7 @@ eval_fmt_mod_unsigned: } if (arg == NULL) { +too_few_args: warningf(WARN_FORMAT, pos, "too few arguments for format string"); return -1; } @@ -520,7 +521,7 @@ eval_fmt_mod_unsigned: } } 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) { @@ -533,7 +534,7 @@ eval_fmt_mod_unsigned: 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); + 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: @@ -594,16 +595,15 @@ 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 */ @@ -617,15 +617,28 @@ static void check_scanf_format(const call_argument_t *arg, if (fmt != '%') continue; fmt = *(++c); - if (fmt == '\0') { - warningf(WARN_FORMAT, pos, "dangling '%%' in format string"); - break; - } if (fmt == '%') continue; ++num_fmt; + bool suppress_assignment = false; + if (fmt == '*') { + fmt = *++c; + 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) { @@ -763,20 +776,32 @@ 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': - expected_type = type_int; + case 'c': { switch (fmt_mod) { - case FMT_MOD_NONE: expected_type = type_int; break; /* TODO promoted char */ - case FMT_MOD_l: expected_type = type_wint_t; break; + case FMT_MOD_NONE: expected_type = type_char; break; + case FMT_MOD_l: expected_type = type_wchar_t; break; case FMT_MOD_w: expected_type = type_wchar_t; break; default: 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) { @@ -787,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; @@ -797,17 +822,33 @@ 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': + case 'n': { + if (suppress_assignment) { + warningf(WARN_FORMAT, pos, "conversion '%n' cannot be suppressed with '*' at format %u", num_fmt); + } + switch (fmt_mod) { case FMT_MOD_NONE: expected_type = type_int; break; case FMT_MOD_hh: expected_type = type_signed_char; break; @@ -823,17 +864,22 @@ static void check_scanf_format(const call_argument_t *arg, goto next_arg; } break; + } default: warningf(WARN_FORMAT, pos, "encountered unknown conversion specifier '%%%c' at format %u", fmt, num_fmt); - if (arg == NULL) { - warningf(WARN_FORMAT, pos, "too few arguments for format string"); - return; - } + if (suppress_assignment) + continue; + if (arg == NULL) + goto too_few_args; goto next_arg; } + if (suppress_assignment) + continue; + if (arg == NULL) { +too_few_args: warningf(WARN_FORMAT, pos, "too few arguments for format string"); return; } @@ -868,7 +914,7 @@ 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); + 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: @@ -956,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]);