diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-09-21 00:56:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-21 00:56:16 +0000 |
| commit | 39b65475d9a301110f1d2483946ea6ac17044d6a (patch) | |
| tree | 5b3c1ce208db23d64328b69a4ebf85b1bde72abf /linker/linker.cpp | |
| parent | 60b8ad3b86a9a899c84f4895916dfabf1786eaf7 (diff) | |
| parent | 23ec4fd7e6406fa15a6d6a82aa1de5306c0ea2bc (diff) | |
Merge changes from topic "host_bionic" am: 6e6e1abb89 am: 9938cdeee8
am: 23ec4fd7e6
Change-Id: Ieb803f66f1f0f7bd29fea16df7e48f3c0195e3bf
Diffstat (limited to 'linker/linker.cpp')
| -rw-r--r-- | linker/linker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp index 6e6bb5a9f..f3d4a67f2 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -3501,7 +3501,7 @@ std::vector<android_namespace_t*> init_default_namespaces(const char* executable const char *interp = phdr_table_get_interpreter_name(somain->phdr, somain->phnum, somain->load_bias); - const char* bname = basename(interp); + const char* bname = (interp != nullptr) ? basename(interp) : nullptr; g_is_asan = bname != nullptr && (strcmp(bname, "linker_asan") == 0 || |