Mercurial > vim
diff src/strings.c @ 33148:7bc10151ce81 v9.0.1856
patch 9.0.1856: issues with formatting positional arguments
Commit: https://github.com/vim/vim/commit/aa90d4f031f73a34aaef5746931ea746849a2231
Author: Christ van Willegen <cvwillegen@gmail.com>
Date: Sun Sep 3 17:22:37 2023 +0200
patch 9.0.1856: issues with formatting positional arguments
Problem: issues with formatting positional arguments
Solution: fix them, add tests and documentation
closes: #12140
closes: #12985
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Christ van Willegen <cvwillegen@gmail.com>
Tentatively fix message_test. Check NULL ptr.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 03 Sep 2023 17:30:05 +0200 |
parents | 0bdb1f8a17c1 |
children | 5da7208ea315 |
line wrap: on
line diff
--- a/src/strings.c +++ b/src/strings.c @@ -2251,8 +2251,7 @@ enum */ static int format_typeof( - const char *type, - int usetvs UNUSED) + const char *type) { // allowed values: \0, h, l, L char length_modifier = '\0'; @@ -2285,18 +2284,6 @@ format_typeof( default: break; } -# if defined(FEAT_EVAL) - if (usetvs) - { - switch (fmt_spec) - { - case 'd': case 'u': case 'o': case 'x': case 'X': - if (length_modifier == '\0') - length_modifier = 'L'; - } - } -# endif - // get parameter value, do initial processing switch (fmt_spec) { @@ -2330,7 +2317,7 @@ format_typeof( if (fmt_spec == 'p') return TYPE_POINTER; else if (fmt_spec == 'b' || fmt_spec == 'B') - return TYPE_UNSIGNEDINT; + return TYPE_UNSIGNEDLONGLONGINT; else if (fmt_spec == 'd') { // signed @@ -2379,7 +2366,7 @@ format_typeof( format_typename( const char *type) { - switch (format_typeof(type, FALSE)) + switch (format_typeof(type)) { case TYPE_INT: return _(typename_int); @@ -2467,7 +2454,7 @@ adjust_types( } else { - if (format_typeof(type, FALSE) != format_typeof((*ap_types)[arg - 1], FALSE)) + if (format_typeof(type) != format_typeof((*ap_types)[arg - 1])) { semsg(_( e_positional_arg_num_type_inconsistent_str_str), arg, format_typename(type), format_typename((*ap_types)[arg - 1])); return FAIL; @@ -2784,7 +2771,8 @@ skip_to_arg( va_list ap_start, va_list *ap, int *arg_idx, - int *arg_cur) + int *arg_cur, + const char *fmt) { int arg_min = 0; @@ -2809,9 +2797,17 @@ skip_to_arg( for (*arg_cur = arg_min; *arg_cur < *arg_idx - 1; ++*arg_cur) { - const char *p = ap_types[*arg_cur]; - - int fmt_type = format_typeof(p, TRUE); + const char *p; + + if (ap_types == NULL || ap_types[*arg_cur] == NULL) + { + semsg(e_aptypes_is_null_str_nr, fmt, *arg_cur); + return; + } + + p = ap_types[*arg_cur]; + + int fmt_type = format_typeof(p); // get parameter value, do initial processing switch (fmt_type) @@ -3024,7 +3020,8 @@ vim_vsnprintf_typval( # if defined(FEAT_EVAL) tvs != NULL ? tv_nr(tvs, &arg_idx) : # endif - (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, &arg_cur), + (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, + &arg_cur, fmt), va_arg(ap, int)); if (j >= 0) @@ -3084,7 +3081,8 @@ vim_vsnprintf_typval( # if defined(FEAT_EVAL) tvs != NULL ? tv_nr(tvs, &arg_idx) : # endif - (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, &arg_cur), + (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, + &arg_cur, fmt), va_arg(ap, int)); if (j >= 0) @@ -3157,7 +3155,8 @@ vim_vsnprintf_typval( # if defined(FEAT_EVAL) tvs != NULL ? tv_nr(tvs, &arg_idx) : # endif - (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, &arg_cur), + (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, + &arg_cur, fmt), va_arg(ap, int)); // standard demands unsigned char @@ -3172,7 +3171,8 @@ vim_vsnprintf_typval( # if defined(FEAT_EVAL) tvs != NULL ? tv_str(tvs, &arg_idx, &tofree) : # endif - (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, &arg_cur), + (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, + &arg_cur, fmt), va_arg(ap, char *)); if (str_arg == NULL) @@ -3269,7 +3269,8 @@ vim_vsnprintf_typval( tvs != NULL ? (void *)tv_str(tvs, &arg_idx, NULL) : # endif - (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, &arg_cur), + (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, + &arg_cur, fmt), va_arg(ap, void *)); if (ptr_arg != NULL) @@ -3282,7 +3283,8 @@ vim_vsnprintf_typval( tvs != NULL ? (uvarnumber_T)tv_nr(tvs, &arg_idx) : # endif - (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, &arg_cur), + (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, + &arg_cur, fmt), va_arg(ap, uvarnumber_T)); if (bin_arg != 0) @@ -3300,7 +3302,8 @@ vim_vsnprintf_typval( # if defined(FEAT_EVAL) tvs != NULL ? tv_nr(tvs, &arg_idx) : # endif - (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, &arg_cur), + (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, + &arg_cur, fmt), va_arg(ap, int)); if (int_arg > 0) @@ -3313,7 +3316,8 @@ vim_vsnprintf_typval( # if defined(FEAT_EVAL) tvs != NULL ? tv_nr(tvs, &arg_idx) : # endif - (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, &arg_cur), + (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, + &arg_cur, fmt), va_arg(ap, long int)); if (long_arg > 0) @@ -3326,7 +3330,8 @@ vim_vsnprintf_typval( # if defined(FEAT_EVAL) tvs != NULL ? tv_nr(tvs, &arg_idx) : # endif - (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, &arg_cur), + (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, + &arg_cur, fmt), va_arg(ap, varnumber_T)); if (llong_arg > 0) @@ -3348,7 +3353,8 @@ vim_vsnprintf_typval( tvs != NULL ? (unsigned) tv_nr(tvs, &arg_idx) : # endif - (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, &arg_cur), + (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, + &arg_cur, fmt), va_arg(ap, unsigned int)); if (uint_arg != 0) @@ -3360,7 +3366,8 @@ vim_vsnprintf_typval( tvs != NULL ? (unsigned long) tv_nr(tvs, &arg_idx) : # endif - (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, &arg_cur), + (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, + &arg_cur, fmt), va_arg(ap, unsigned long int)); if (ulong_arg != 0) @@ -3372,7 +3379,8 @@ vim_vsnprintf_typval( tvs != NULL ? (uvarnumber_T) tv_nr(tvs, &arg_idx) : # endif - (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, &arg_cur), + (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, + &arg_cur, fmt), va_arg(ap, uvarnumber_T)); if (ullong_arg != 0) @@ -3574,7 +3582,8 @@ vim_vsnprintf_typval( # if defined(FEAT_EVAL) tvs != NULL ? tv_float(tvs, &arg_idx) : # endif - (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, &arg_cur), + (skip_to_arg(ap_types, ap_start, &ap, &arg_idx, + &arg_cur, fmt), va_arg(ap, double)); abs_f = f < 0 ? -f : f;