Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix checking for subdirs when parsing apks"

Browse Source
This commit is contained in:
Jeremy Meyer
2023-02-16 17:51:19 +00:00
committed by Android (Google) Code Review
parent 57455aa60c 12312e0735
commit c574f5ca4e
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/androidfw/ApkParsing.cpp
View File

@@ -56,10 +56,8 @@ const char* ValidLibraryPathLastSlash(const char* fileName, bool suppress64Bit,
return nullptr;
}
// Make sure there aren't subdirectories
const char* abiOffset = fileName + APK_LIB_LEN;
const size_t abiSize = lastSlash - abiOffset;
if (memchr(abiOffset, '/', abiSize)) {
// Make sure there aren't subdirectories by checking if the next / after lib/ is the last slash
if (memchr(fileName + APK_LIB_LEN, '/', fileNameLen - APK_LIB_LEN) != lastSlash) {
return nullptr;
}

6
libs/androidfw/tests/ApkParsing_test.cpp
View File

@@ -68,4 +68,10 @@ TEST(ApkParsingTest, InvalidSubdirectories) {
auto lastSlash = util::ValidLibraryPathLastSlash(path, false, false);
ASSERT_THAT(lastSlash, IsNull());
}
TEST(ApkParsingTest, InvalidFileAtRoot) {
const char* path = "lib/library.so";
auto lastSlash = util::ValidLibraryPathLastSlash(path, false, false);
ASSERT_THAT(lastSlash, IsNull());
}
}