commit 9fb216f844bb15c8e8f27c5ac0490a2f6faacb57
author Dmitriy Ivanov <dimitry@google.com> Sat Nov 01 02:30:38 2014 +0000
committer Dmitriy Ivanov <dimitry@google.com> Sat Nov 01 02:30:38 2014 +0000
tree ca512db1d67c98e989365fedd3a1f3d08a3e658a
parent da8e591c3996879e41dc5f70b77d1b0fe6f9c225

Revert "Use local copy of the library name on dlopen"

This reverts commit da8e591c3996879e41dc5f70b77d1b0fe6f9c225.

Change-Id: I3fd6f235b18c232af5cc5ecd481851486d7d68f6

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 1dae343..f14d8b4 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -107,8 +107,6 @@
 #define LDPRELOAD_BUFSIZE (LDPRELOAD_MAX*64)
 #define LDPRELOAD_MAX 8
 
-#define MAX_PATH_LEN 512
-
 static char g_ld_library_paths_buffer[LDPATH_BUFSIZE];
 static const char* g_ld_library_paths[LDPATH_MAX + 1];
 
@@ -752,7 +750,7 @@
 }
 
 static int open_library_on_path(const char* name, const char* const paths[]) {
-  char buf[MAX_PATH_LEN];
+  char buf[512];
   for (size_t i = 0; paths[i] != nullptr; ++i) {
     int n = __libc_format_buffer(buf, sizeof(buf), "%s/%s", paths[i], name);
     if (n < 0 || n >= static_cast<int>(sizeof(buf))) {
@@ -1105,18 +1103,8 @@
       return nullptr;
     }
   }
-
-  size_t name_len = strlen(name);
-  if (name_len >= MAX_PATH_LEN) {
-    DL_ERR("library name \"%s\" is too long", name);
-    return nullptr;
-  }
-
-  char local_name[name_len+1];
-  strlcpy(local_name, name, name_len+1);
-
   protect_data(PROT_READ | PROT_WRITE);
-  soinfo* si = find_library(local_name, flags, extinfo);
+  soinfo* si = find_library(name, flags, extinfo);
   if (si != nullptr) {
     si->CallConstructors();
   }