comparison src/viminfo.c @ 34074:1629cc65d78d v9.1.0006

patch 9.1.0006: is*() and to*() function may be unsafe Commit: https://github.com/vim/vim/commit/184f71cc6868a240dc872ed2852542bbc1d43e28 Author: Keith Thompson <Keith.S.Thompson@gmail.com> Date: Thu Jan 4 21:19:04 2024 +0100 patch 9.1.0006: is*() and to*() function may be unsafe 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>
author Christian Brabandt <cb@256bit.org>
date Thu, 04 Jan 2024 21:30:04 +0100
parents 7d9d2404a3d4
children
comparison
equal deleted inserted replaced
34073:7d9c9731e78e 34074:1629cc65d78d
1066 return eof || virp->vir_line[0] == '|'; 1066 return eof || virp->vir_line[0] == '|';
1067 p = virp->vir_line + 2; 1067 p = virp->vir_line + 2;
1068 } 1068 }
1069 } 1069 }
1070 1070
1071 if (isdigit(*p)) 1071 if (SAFE_isdigit(*p))
1072 { 1072 {
1073 value->bv_type = BVAL_NR; 1073 value->bv_type = BVAL_NR;
1074 value->bv_nr = getdigits(&p); 1074 value->bv_nr = getdigits(&p);
1075 ++values->ga_len; 1075 ++values->ga_len;
1076 } 1076 }
2483 // We only get here if line[0] == '\'' or '-'. 2483 // We only get here if line[0] == '\'' or '-'.
2484 // Illegal mark names are ignored (for future expansion). 2484 // Illegal mark names are ignored (for future expansion).
2485 str = virp->vir_line + 1; 2485 str = virp->vir_line + 1;
2486 if (*str <= 127 2486 if (*str <= 127
2487 && ((*virp->vir_line == '\'' 2487 && ((*virp->vir_line == '\''
2488 && (VIM_ISDIGIT(*str) || isupper(*str))) 2488 && (VIM_ISDIGIT(*str) || SAFE_isupper(*str)))
2489 || (*virp->vir_line == '-' && *str == '\''))) 2489 || (*virp->vir_line == '-' && *str == '\'')))
2490 { 2490 {
2491 if (*str == '\'') 2491 if (*str == '\'')
2492 { 2492 {
2493 // If the jumplist isn't full insert fmark as oldest entry 2493 // If the jumplist isn't full insert fmark as oldest entry