diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-08-30 07:20:40 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-30 07:20:40 (GMT) |
| commit | 85ca9c049c5a490d143d28933bbb02ab80394ed8 (patch) | |
| tree | 17c0ca81f4290f34ab86ca52d73612026ab1c067 /Python | |
| parent | a1473d2c9106abbdc619bdcc973c15a87e3f0f12 (diff) | |
| download | cpython-85ca9c049c5a490d143d28933bbb02ab80394ed8.zip cpython-85ca9c049c5a490d143d28933bbb02ab80394ed8.tar.gz cpython-85ca9c049c5a490d143d28933bbb02ab80394ed8.tar.bz2 | |
bpo-41524: fix pointer bug in PyOS_mystr{n}icmp (GH-21845) (GH-22016)
Diffstat (limited to 'Python')
| -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)); } |