mirror of
https://github.com/python/cpython.git
synced 2024-11-27 23:47:29 +01:00
97eaf2b5e5
* bpo-41524: fix pointer bug in PyOS_mystr{n}icmp
The existing implementations of PyOS_mystrnicmp and PyOS_mystricmp
can increment pointers beyond the end of a string.
This commit fixes those cases by moving the mutation out of the condition.
* 📜🤖 Added by blurb_it.
* Address comments
Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
31 lines
753 B
C
31 lines
753 B
C
/* Cross platform case insensitive string compare functions
|
|
*/
|
|
|
|
#include "Python.h"
|
|
|
|
int
|
|
PyOS_mystrnicmp(const char *s1, const char *s2, Py_ssize_t size)
|
|
{
|
|
const unsigned char *p1, *p2;
|
|
if (size == 0)
|
|
return 0;
|
|
p1 = (const unsigned char *)s1;
|
|
p2 = (const unsigned char *)s2;
|
|
for (; (--size > 0) && *p1 && *p2 && (tolower(*p1) == tolower(*p2));
|
|
p1++, p2++) {
|
|
;
|
|
}
|
|
return tolower(*p1) - tolower(*p2);
|
|
}
|
|
|
|
int
|
|
PyOS_mystricmp(const char *s1, const char *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(*p1) - tolower(*p2));
|
|
}
|