tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
commit 4498917406
2 changed files with 5 additions and 19 deletions
Show stats 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_STATIC_LIBRARIES := libc_nomalloc libziparchive libutils libz liblog
LOCAL_STATIC_LIBRARIES := libc_nomalloc libziparchive libutils libbase libz liblog
LOCAL_FORCE_STATIC_EXECUTABLE := true

22
linker/linker.cpp
View file

@ -57,6 +57,8 @@
#include "linker_phdr.h"
#include "linker_relocs.h"
#include "linker_reloc_iterators.h"
#include "base/strings.h"
#include "ziparchive/zip_archive.h"
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,
std::vector<std::string>* paths) {
if (path == nullptr) {
return;
}
paths->clear();
for (const char *p = path; ; ++p) {
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;
}
if (path != nullptr) {
*paths = android::base::Split(path, delimiters);
}
}