Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1426989 - Fix NS_strncmp. r=erahm

Browse Source 
--HG--
extra : rebase_source : 0dc3bc4f32a7564dadbdb5e5930679f83b9cdc1d
extra : intermediate-source : 454bde0083c54e8a01c50dc2e7a03b74349a537e
extra : source : 6fa2311f5909e1577d8d515c62d2106b76d1f469
This commit is contained in:
Masatoshi Kimura 2017-12-24 16:39:24 +09:00
parent 653167e88f
commit efc13822e0
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xpcom/base/nsCRTGlue.cpp
View File

@ -117,7 +117,7 @@ NS_strncmp(const char16_t* aStrA, const char16_t* aStrB, size_t aLen)
--aLen;
}
return aLen ? *aStrA != '\0' : *aStrA - *aStrB;
return aLen ? *aStrA != '\0' : 0;
}
char16_t*

33
xpcom/tests/gtest/TestCRT.cpp
View File

@ -30,31 +30,45 @@ int sign(int val) {
// Verify that nsCRT versions of string comparison routines get the
// same answers as the native non-unicode versions. We only pass in
// iso-latin-1 strings, so the comparison must be valid.
static void Check(const char* s1, const char* s2, int n)
static void Check(const char* s1, const char* s2, size_t n)
{
int clib = PL_strcmp(s1, s2);
bool longerThanN = strlen(s1) > n || strlen(s2) > n;
int clib = PL_strcmp(s1, s2);
int clib_n = PL_strncmp(s1, s2, n);
if (!longerThanN) {
EXPECT_EQ(sign(clib), sign(clib_n));
}
nsAutoString t1,t2;
CopyASCIItoUTF16(s1, t1);
CopyASCIItoUTF16(s2, t2);
const char16_t* us1 = t1.get();
const char16_t* us2 = t2.get();
int u2 = nsCRT::strcmp(us1, us2);
int u2, u2_n;
// nsCRT::strncmp will cause buffer overrun
// if the string buffer is shorter than |n|.
if (!longerThanN) {
u2 = nsCRT::strcmp(us1, us2);
u2_n = nsCRT::strncmp(us1, us2, n);
int u2_n = nsCRT::strncmp(us1, us2, n);
EXPECT_EQ(sign(clib), sign(u2));
EXPECT_EQ(sign(clib_n), sign(u2_n));
}
u2 = NS_strcmp(us1, us2);
u2_n = NS_strncmp(us1, us2, n);
EXPECT_EQ(sign(clib), sign(u2));
EXPECT_EQ(sign(clib), sign(u2_n));
EXPECT_EQ(sign(clib), sign(clib_n));
EXPECT_EQ(sign(clib_n), sign(u2_n));
}
struct Test {
const char* s1;
const char* s2;
int n;
size_t n;
};
static Test tests[] = {
@ -72,6 +86,11 @@ static Test tests[] = {
{ "bar", "foo", 3 },
{ "bar", "fo", 3 },
{ "foo", "foobar", 3 },
{ "foobar", "foo", 3 },
{ "foobar", "foozap", 3 },
{ "foozap", "foobar", 3 },
};
#define NUM_TESTS int((sizeof(tests) / sizeof(tests[0])))