src/solaris/back/linker_md.c

rev 6659 : 8009558: linked_md.c::dll_build_name can get stuck in an infinite loop
Reviewed-by:

*** 53,90 ****
  #else
  #define LIB_SUFFIX "so"
  #endif
  
  static void dll_build_name(char* buffer, size_t buflen,
!                            const char* pname, const char* fname) {
!     // Based on os_solaris.cpp
  
!     char *path_sep = PATH_SEPARATOR;
!     char *pathname = (char *)pname;
!     *buffer = '\0';
!     while (strlen(pathname) > 0) {
!         char *p = strchr(pathname, *path_sep);
!         if (p == NULL) {
!             p = pathname + strlen(pathname);
!         }
!         /* check for NULL path */
!         if (p == pathname) {
!             continue;
          }
-         (void)snprintf(buffer, buflen, "%.*s/lib%s." LIB_SUFFIX, (int)(p - pathname),
-                        pathname, fname);
  
          if (access(buffer, F_OK) == 0) {
              break;
          }
-         if (*p == '\0') {
-             pathname = p;
-         } else {
-             pathname = p + 1;
-         }
          *buffer = '\0';
      }
  }
  
  /*
   * create a string for the JNI native function name by adding the
   * appropriate decorations.
--- 53,83 ----
  #else
  #define LIB_SUFFIX "so"
  #endif
  
  static void dll_build_name(char* buffer, size_t buflen,
!                            const char* paths, const char* fname) {
!     char *path, *paths_copy, *next_token;
  
!     paths_copy = strdup(paths);
!     if (paths_copy == NULL) {
!         return;
      }
  
+     next_token = NULL;
+     path = strtok_r(paths_copy, PATH_SEPARATOR, &next_token);
+ 
+     while(path != NULL) {
+         snprintf(buffer, buflen, "%s/lib%s." LIB_SUFFIX, path, fname);
          if (access(buffer, F_OK) == 0) {
              break;
          }
          *buffer = '\0';
+         path = strtok_r(NULL, PATH_SEPARATOR, &next_token);
      }
+ 
+     free(paths_copy);
  }
  
  /*
   * create a string for the JNI native function name by adding the
   * appropriate decorations.
*** 101,111 ****
  /*
   * create a string for the dynamic lib open call by adding the
   * appropriate pre and extensions to a filename and the path
   */
  void
! dbgsysBuildLibName(char *holder, int holderlen, char *pname, char *fname)
  {
      const int pnamelen = pname ? strlen(pname) : 0;
  
      *holder = '\0';
      /* Quietly truncate on buffer overflow.  Should be an error. */
--- 94,104 ----
  /*
   * create a string for the dynamic lib open call by adding the
   * appropriate pre and extensions to a filename and the path
   */
  void
! dbgsysBuildLibName(char *holder, int holderlen, const char *pname, const char *fname)
  {
      const int pnamelen = pname ? strlen(pname) : 0;
  
      *holder = '\0';
      /* Quietly truncate on buffer overflow.  Should be an error. */