src/os/bsd/vm/os_bsd.cpp

*** 416,437 ****
                                                       strlen(v) + 1 +
                                                       sizeof(SYS_EXT_DIR) + sizeof("/lib/") + strlen(cpu_arch) + sizeof(DEFAULT_LIBPATH) + 1,
                                                       mtInternal);
      sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib/%s:" DEFAULT_LIBPATH, v, v_colon, cpu_arch);
      Arguments::set_library_path(ld_library_path);
!     FREE_C_HEAP_ARRAY(char, ld_library_path, mtInternal);
    }
  
    // Extensions directories.
    sprintf(buf, "%s" EXTENSIONS_DIR ":" SYS_EXT_DIR EXTENSIONS_DIR, Arguments::get_java_home());
    Arguments::set_ext_dirs(buf);
  
    // Endorsed standards default directory.
    sprintf(buf, "%s" ENDORSED_DIR, Arguments::get_java_home());
    Arguments::set_endorsed_dirs(buf);
  
!   FREE_C_HEAP_ARRAY(char, buf, mtInternal);
  
  #else // __APPLE__
  
    #define SYS_EXTENSIONS_DIR   "/Library/Java/Extensions"
    #define SYS_EXTENSIONS_DIRS  SYS_EXTENSIONS_DIR ":/Network" SYS_EXTENSIONS_DIR ":/System" SYS_EXTENSIONS_DIR ":/usr/lib/java"
--- 416,437 ----
                                                       strlen(v) + 1 +
                                                       sizeof(SYS_EXT_DIR) + sizeof("/lib/") + strlen(cpu_arch) + sizeof(DEFAULT_LIBPATH) + 1,
                                                       mtInternal);
      sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib/%s:" DEFAULT_LIBPATH, v, v_colon, cpu_arch);
      Arguments::set_library_path(ld_library_path);
!     FREE_C_HEAP_ARRAY(char, ld_library_path);
    }
  
    // Extensions directories.
    sprintf(buf, "%s" EXTENSIONS_DIR ":" SYS_EXT_DIR EXTENSIONS_DIR, Arguments::get_java_home());
    Arguments::set_ext_dirs(buf);
  
    // Endorsed standards default directory.
    sprintf(buf, "%s" ENDORSED_DIR, Arguments::get_java_home());
    Arguments::set_endorsed_dirs(buf);
  
!   FREE_C_HEAP_ARRAY(char, buf);
  
  #else // __APPLE__
  
    #define SYS_EXTENSIONS_DIR   "/Library/Java/Extensions"
    #define SYS_EXTENSIONS_DIRS  SYS_EXTENSIONS_DIR ":/Network" SYS_EXTENSIONS_DIR ":/System" SYS_EXTENSIONS_DIR ":/usr/lib/java"
*** 511,521 ****
                                                       system_ext_size + 3,
                                                       mtInternal);
      sprintf(ld_library_path, "%s%s%s%s%s" SYS_EXTENSIONS_DIR ":" SYS_EXTENSIONS_DIRS ":.",
              v, v_colon, l, l_colon, user_home_dir);
      Arguments::set_library_path(ld_library_path);
!     FREE_C_HEAP_ARRAY(char, ld_library_path, mtInternal);
    }
  
    // Extensions directories.
    //
    // Note that the space for the colon and the trailing null are provided
--- 511,521 ----
                                                       system_ext_size + 3,
                                                       mtInternal);
      sprintf(ld_library_path, "%s%s%s%s%s" SYS_EXTENSIONS_DIR ":" SYS_EXTENSIONS_DIRS ":.",
              v, v_colon, l, l_colon, user_home_dir);
      Arguments::set_library_path(ld_library_path);
!     FREE_C_HEAP_ARRAY(char, ld_library_path);
    }
  
    // Extensions directories.
    //
    // Note that the space for the colon and the trailing null are provided
*** 527,537 ****
  
    // Endorsed standards default directory.
    sprintf(buf, "%s" ENDORSED_DIR, Arguments::get_java_home());
    Arguments::set_endorsed_dirs(buf);
  
!   FREE_C_HEAP_ARRAY(char, buf, mtInternal);
  
  #undef SYS_EXTENSIONS_DIR
  #undef SYS_EXTENSIONS_DIRS
  
  #endif // __APPLE__
--- 527,537 ----
  
    // Endorsed standards default directory.
    sprintf(buf, "%s" ENDORSED_DIR, Arguments::get_java_home());
    Arguments::set_endorsed_dirs(buf);
  
!   FREE_C_HEAP_ARRAY(char, buf);
  
  #undef SYS_EXTENSIONS_DIR
  #undef SYS_EXTENSIONS_DIRS
  
  #endif // __APPLE__
*** 1313,1327 ****
        }
      }
      // release the storage
      for (int i = 0; i < n; i++) {
        if (pelements[i] != NULL) {
!         FREE_C_HEAP_ARRAY(char, pelements[i], mtInternal);
        }
      }
      if (pelements != NULL) {
!       FREE_C_HEAP_ARRAY(char*, pelements, mtInternal);
      }
    } else {
      snprintf(buffer, buflen, "%s/" JNI_LIB_PREFIX "%s" JNI_LIB_SUFFIX, pname, fname);
      retval = true;
    }
--- 1313,1327 ----
        }
      }
      // release the storage
      for (int i = 0; i < n; i++) {
        if (pelements[i] != NULL) {
!         FREE_C_HEAP_ARRAY(char, pelements[i]);
        }
      }
      if (pelements != NULL) {
!       FREE_C_HEAP_ARRAY(char*, pelements);
      }
    } else {
      snprintf(buffer, buflen, "%s/" JNI_LIB_PREFIX "%s" JNI_LIB_SUFFIX, pname, fname);
      retval = true;
    }