diff options
| author | Keith Thompson <Keith.S.Thompson@gmail.com> | 2024-01-04 21:19:04 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-01-04 21:19:04 +0100 |
| commit | 184f71cc6868a240dc872ed2852542bbc1d43e28 (patch) | |
| tree | 314948c5cf288feb24305b329d58cbd750157560 /src/evalvars.c | |
| parent | 4d8cb683b1543ec02563cdd2d068ce5f82f90539 (diff) | |
patch 9.1.0006: is*() and to*() function may be unsafev9.1.0006
Problem: is*() and to*() function may be unsafe
Solution: Add SAFE_* macros and start using those instead
(Keith Thompson)
Use SAFE_() macros for is*() and to*() functions
The standard is*() and to*() functions declared in <ctype.h> have
undefined behavior for negative arguments other than EOF. If plain char
is signed, passing an unchecked value from argv for from user input
to one of these functions has undefined behavior.
Solution: Add SAFE_*() macros that cast the argument to unsigned char.
Most implementations behave sanely for negative arguments, and most
character values in practice are non-negative, but it's still best
to avoid undefined behavior.
The change from #13347 has been omitted, as this has already been
separately fixed in commit ac709e2fc0db6d31abb7da96f743c40956b60c3a
(v9.0.2054)
fixes: #13332
closes: #13347
Signed-off-by: Keith Thompson <Keith.S.Thompson@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
Diffstat (limited to 'src/evalvars.c')
| -rw-r--r-- | src/evalvars.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/evalvars.c b/src/evalvars.c index ea039cbed1..8e42c5a307 100644 --- a/src/evalvars.c +++ b/src/evalvars.c @@ -3332,7 +3332,7 @@ find_var(char_u *name, hashtab_T **htp, int no_autoload) dictitem_T * find_var_also_in_script(char_u *name, hashtab_T **htp, int no_autoload) { - if (STRNCMP(name, "<SNR>", 5) == 0 && isdigit(name[5])) + if (STRNCMP(name, "<SNR>", 5) == 0 && SAFE_isdigit(name[5])) { char_u *p = name + 5; int sid = getdigits(&p); @@ -4975,7 +4975,7 @@ get_callback(typval_T *arg) else { if (arg->v_type == VAR_STRING && arg->vval.v_string != NULL - && isdigit(*arg->vval.v_string)) + && SAFE_isdigit(*arg->vval.v_string)) r = FAIL; else if (arg->v_type == VAR_FUNC || arg->v_type == VAR_STRING) { |