зеркало из https://github.com/microsoft/git.git
isxdigit: cast input to unsigned char
Otherwise, callers must do so or risk triggering warnings -Wchar-subscript (and rightfully so; a signed char might cause us to use a bogus negative index into the hexval_table). While we are dropping the now-unnecessary casts from the caller in urlmatch.c, we can get rid of similar casts in actually parsing the hex by using the hexval() helper, which implicitly casts to unsigned (but note that we cannot implement isxdigit in terms of hexval(), as it also casts its return value to unsigned). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
fe1b22686f
Коммит
50a71776ab
|
@ -677,7 +677,7 @@ extern const unsigned char sane_ctype[256];
|
|||
#define iscntrl(x) (sane_istest(x,GIT_CNTRL))
|
||||
#define ispunct(x) sane_istest(x, GIT_PUNCT | GIT_REGEX_SPECIAL | \
|
||||
GIT_GLOB_SPECIAL | GIT_PATHSPEC_MAGIC)
|
||||
#define isxdigit(x) (hexval_table[x] != -1)
|
||||
#define isxdigit(x) (hexval_table[(unsigned char)(x)] != -1)
|
||||
#define tolower(x) sane_case((unsigned char)(x), 0x20)
|
||||
#define toupper(x) sane_case((unsigned char)(x), 0)
|
||||
#define is_pathspec_magic(x) sane_istest(x,GIT_PATHSPEC_MAGIC)
|
||||
|
|
|
@ -43,11 +43,11 @@ static int append_normalized_escapes(struct strbuf *buf,
|
|||
from_len--;
|
||||
if (ch == '%') {
|
||||
if (from_len < 2 ||
|
||||
!isxdigit((unsigned char)from[0]) ||
|
||||
!isxdigit((unsigned char)from[1]))
|
||||
!isxdigit(from[0]) ||
|
||||
!isxdigit(from[1]))
|
||||
return 0;
|
||||
ch = hexval_table[(unsigned char)*from++] << 4;
|
||||
ch |= hexval_table[(unsigned char)*from++];
|
||||
ch = hexval(*from++) << 4;
|
||||
ch |= hexval(*from++);
|
||||
from_len -= 2;
|
||||
was_esc = 1;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче