diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-08-30 06:53:09 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-30 06:53:09 (GMT) |
| commit | 901c2eae6e27ee7793e5a3c638664e01a3bf8de8 (patch) | |
| tree | f1ff05311722a84b53d8b50ae9bfb6ed535489b2 /Python/pystrcmp.c | |
| parent | 6b5e88744cb48156a5dee47244dbc1b0dd82567c (diff) | |
| download | cpython-901c2eae6e27ee7793e5a3c638664e01a3bf8de8.zip cpython-901c2eae6e27ee7793e5a3c638664e01a3bf8de8.tar.gz cpython-901c2eae6e27ee7793e5a3c638664e01a3bf8de8.tar.bz2 | |
bpo-41524: fix pointer bug in PyOS_mystr{n}icmp (GH-21845) (GH-21978)
Diffstat (limited to 'Python/pystrcmp.c')
| -rw-r--r-- | Python/pystrcmp.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/Python/pystrcmp.c b/Python/pystrcmp.c index f9c2277..9224ce4 100644 --- a/Python/pystrcmp.c +++ b/Python/pystrcmp.c @@ -6,21 +6,25 @@ int PyOS_mystrnicmp(const char *s1, const char *s2, Py_ssize_t size) { + const unsigned char *p1, *p2; if (size == 0) return 0; - while ((--size > 0) && - (tolower((unsigned)*s1) == tolower((unsigned)*s2))) { - if (!*s1++ || !*s2++) - break; + p1 = (const unsigned char *)s1; + p2 = (const unsigned char *)s2; + for (; (--size > 0) && *p1 && *p2 && (tolower(*p1) == tolower(*p2)); + p1++, p2++) { + ; } - return tolower((unsigned)*s1) - tolower((unsigned)*s2); + return tolower(*p1) - tolower(*p2); } int PyOS_mystricmp(const char *s1, const char *s2) { - while (*s1 && (tolower((unsigned)*s1++) == tolower((unsigned)*s2++))) { + const unsigned char *p1 = (const unsigned char *)s1; + const unsigned char *p2 = (const unsigned char *)s2; + for (; *p1 && *p2 && (tolower(*p1) == tolower(*p2)); p1++, p2++) { ; } - return (tolower((unsigned)*s1) - tolower((unsigned)*s2)); + return (tolower(*p1) - tolower(*p2)); } |