maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Replace strlen with strnlen in native code (#5510)

Browse source 
* fix expected vs actual for easier troubleshooting
* replace strlen calls with strnlen
This commit is contained in:
Travis Plunk 2017-11-21 16:20:25 -08:00 committed by GitHub
parent 227da48490
commit 9559694191
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libpsl-native/src/followsymlink.cpp
View file

@ -39,7 +39,7 @@ char* FollowSymLink(const char* fileName)
if (realPath)
{
return strndup(realPath, strlen(realPath) + 1);
return strndup(realPath, strnlen(realPath, PATH_MAX));
}
// if the path wasn't resolved, use readlink

2
src/libpsl-native/src/getfullyqualifiedname.cpp
View file

@ -43,7 +43,7 @@ char *GetFullyQualifiedName()
}
// return the first canonical name in the list
fullName = strndup(info->ai_canonname, strlen(info->ai_canonname));
fullName = strndup(info->ai_canonname, strnlen(info->ai_canonname, NI_MAXHOST));
// only free info if getaddrinfo was successful
freeaddrinfo(info);

4
src/libpsl-native/test/test-createsymlink.cpp
View file

@ -92,7 +92,7 @@ TEST_F(CreateSymLinkTest, SymLinkToFile)
std::string target = FollowSymLink(fileSymLink.c_str());
char buffer[PATH_MAX];
std::string expected = realpath(file, buffer);
EXPECT_EQ(target, expected);
EXPECT_EQ(expected, target);
}
TEST_F(CreateSymLinkTest, SymLinkToDirectory)
@ -103,7 +103,7 @@ TEST_F(CreateSymLinkTest, SymLinkToDirectory)
std::string target = FollowSymLink(dirSymLink.c_str());
char buffer[PATH_MAX];
std::string expected = realpath(dir, buffer);
EXPECT_EQ(target, expected);
EXPECT_EQ(expected, target);
}
TEST_F(CreateSymLinkTest, SymLinkAgain)