generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Prevent buffer over-read in linker.cpp's parse_path."

Browse Source
This commit is contained in:
Elliott Hughes
2015-07-30 00:22:48 +00:00
committed by Gerrit Code Review
parent 34c5f5eacd b447440a4b
commit 4498917406
2 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
linker/Android.mk
View File

@@ -60,7 +60,7 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_STATIC_LIBRARIES := libc_nomalloc libziparchive libutils libz liblog LOCAL_STATIC_LIBRARIES := libc_nomalloc libziparchive libutils libbase libz liblog
LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_FORCE_STATIC_EXECUTABLE := true

22
linker/linker.cpp
View File

@@ -57,6 +57,8 @@
#include "linker_phdr.h" #include "linker_phdr.h"
#include "linker_relocs.h" #include "linker_relocs.h"
#include "linker_reloc_iterators.h" #include "linker_reloc_iterators.h"
#include "base/strings.h"
#include "ziparchive/zip_archive.h" #include "ziparchive/zip_archive.h"
extern void __libc_init_AT_SECURE(KernelArgumentBlock&); extern void __libc_init_AT_SECURE(KernelArgumentBlock&);
@@ -308,25 +310,9 @@ static void soinfo_free(soinfo* si) {
static void parse_path(const char* path, const char* delimiters, static void parse_path(const char* path, const char* delimiters,
std::vector<std::string>* paths) { std::vector<std::string>* paths) {
if (path == nullptr) {
return;
}
paths->clear(); paths->clear();
if (path != nullptr) {
for (const char *p = path; ; ++p) { *paths = android::base::Split(path, delimiters);
size_t len = strcspn(p, delimiters);
// skip empty tokens
if (len == 0) {
continue;
}
paths->push_back(std::string(p, len));
p += len;
if (*p == '\0') {
break;
}
} }
} }