< prev index next >

src/hotspot/os/linux/os_linux.cpp

Print this page
*** 426,11 ***
    // Note that the space for the colon and the trailing null are provided
    // by the nulls included by the sizeof operator.
    const size_t bufsize =
      MAX2((size_t)MAXPATHLEN,  // For dll_dir & friends.
           (size_t)MAXPATHLEN + sizeof(EXTENSIONS_DIR) + sizeof(SYS_EXT_DIR) + sizeof(EXTENSIONS_DIR)); // extensions dir
!   char *buf = (char *)NEW_C_HEAP_ARRAY(char, bufsize, mtInternal);
  
    // sysclasspath, java_home, dll_dir
    {
      char *pslash;
      os::jvm_path(buf, bufsize);
--- 426,11 ---
    // Note that the space for the colon and the trailing null are provided
    // by the nulls included by the sizeof operator.
    const size_t bufsize =
      MAX2((size_t)MAXPATHLEN,  // For dll_dir & friends.
           (size_t)MAXPATHLEN + sizeof(EXTENSIONS_DIR) + sizeof(SYS_EXT_DIR) + sizeof(EXTENSIONS_DIR)); // extensions dir
!   char *buf = NEW_C_HEAP_ARRAY(char, bufsize, mtInternal);
  
    // sysclasspath, java_home, dll_dir
    {
      char *pslash;
      os::jvm_path(buf, bufsize);

*** 475,14 ***
      // addressed).
      const char *v = ::getenv("LD_LIBRARY_PATH");
      const char *v_colon = ":";
      if (v == NULL) { v = ""; v_colon = ""; }
      // That's +1 for the colon and +1 for the trailing '\0'.
!     char *ld_library_path = (char *)NEW_C_HEAP_ARRAY(char,
!                                                      strlen(v) + 1 +
!                                                      sizeof(SYS_EXT_DIR) + sizeof("/lib/") + sizeof(DEFAULT_LIBPATH) + 1,
!                                                      mtInternal);
      sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib:" DEFAULT_LIBPATH, v, v_colon);
      Arguments::set_library_path(ld_library_path);
      FREE_C_HEAP_ARRAY(char, ld_library_path);
    }
  
--- 475,14 ---
      // addressed).
      const char *v = ::getenv("LD_LIBRARY_PATH");
      const char *v_colon = ":";
      if (v == NULL) { v = ""; v_colon = ""; }
      // That's +1 for the colon and +1 for the trailing '\0'.
!     char *ld_library_path = NEW_C_HEAP_ARRAY(char,
!                                              strlen(v) + 1 +
!                                              sizeof(SYS_EXT_DIR) + sizeof("/lib/") + sizeof(DEFAULT_LIBPATH) + 1,
!                                              mtInternal);
      sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib:" DEFAULT_LIBPATH, v, v_colon);
      Arguments::set_library_path(ld_library_path);
      FREE_C_HEAP_ARRAY(char, ld_library_path);
    }
  
< prev index next >