Merge
authordsamersoff
Mon, 07 Mar 2016 20:33:26 +0000
changeset 36587 cc1125d38d21
parent 36584 ec64a581096f (current diff)
parent 36586 32b3772b713b (diff)
child 36590 0585ccbcedf5
Merge
--- a/hotspot/src/os/posix/vm/os_posix.cpp	Mon Mar 07 19:29:47 2016 +0000
+++ b/hotspot/src/os/posix/vm/os_posix.cpp	Mon Mar 07 20:33:26 2016 +0000
@@ -336,13 +336,13 @@
   const char *start;
 
   if (lib_name != NULL) {
-    len = name_len = strlen(lib_name);
+    name_len = strlen(lib_name);
     if (is_absolute_path) {
       // Need to strip path, prefix and suffix
       if ((start = strrchr(lib_name, *os::file_separator())) != NULL) {
         lib_name = ++start;
       }
-      if (len <= (prefix_len + suffix_len)) {
+      if (strlen(lib_name) <= (prefix_len + suffix_len)) {
         return NULL;
       }
       lib_name += prefix_len;