src/os/solaris/vm/os_solaris.cpp

*** 822,832 ****
        }
  
        // allocate new buffer and initialize
        info = (Dl_serinfo*)malloc(_info.dls_size);
        if (info == NULL) {
!         vm_exit_out_of_memory(_info.dls_size,
                                "init_system_properties_values info");
        }
        info->dls_size = _info.dls_size;
        info->dls_cnt = _info.dls_cnt;
  
--- 822,832 ----
        }
  
        // allocate new buffer and initialize
        info = (Dl_serinfo*)malloc(_info.dls_size);
        if (info == NULL) {
!         vm_exit_out_of_memory(_info.dls_size, OOM_MALLOC_ERROR,
                                "init_system_properties_values info");
        }
        info->dls_size = _info.dls_size;
        info->dls_cnt = _info.dls_cnt;
  
*** 864,874 ****
        // nulls included by the sizeof operator.
        size_t bufsize = sizeof(COMMON_DIR) + sizeof("/lib/") + strlen(cpu_arch);
        common_path = malloc(bufsize);
        if (common_path == NULL) {
          free(info);
!         vm_exit_out_of_memory(bufsize,
                                "init_system_properties_values common_path");
        }
        sprintf(common_path, COMMON_DIR "/lib/%s", cpu_arch);
  
        // struct size is more than sufficient for the path components obtained
--- 864,874 ----
        // nulls included by the sizeof operator.
        size_t bufsize = sizeof(COMMON_DIR) + sizeof("/lib/") + strlen(cpu_arch);
        common_path = malloc(bufsize);
        if (common_path == NULL) {
          free(info);
!         vm_exit_out_of_memory(bufsize, OOM_MALLOC_ERROR,
                                "init_system_properties_values common_path");
        }
        sprintf(common_path, COMMON_DIR "/lib/%s", cpu_arch);
  
        // struct size is more than sufficient for the path components obtained
*** 877,887 ****
        bufsize = info->dls_size + strlen(common_path);
        library_path = malloc(bufsize);
        if (library_path == NULL) {
          free(info);
          free(common_path);
!         vm_exit_out_of_memory(bufsize,
                                "init_system_properties_values library_path");
        }
        library_path[0] = '\0';
  
        // Construct the desired Java library path from the linker's library
--- 877,887 ----
        bufsize = info->dls_size + strlen(common_path);
        library_path = malloc(bufsize);
        if (library_path == NULL) {
          free(info);
          free(common_path);
!         vm_exit_out_of_memory(bufsize, OOM_MALLOC_ERROR,
                                "init_system_properties_values library_path");
        }
        library_path[0] = '\0';
  
        // Construct the desired Java library path from the linker's library
*** 1621,1631 ****
                        // small number - point is NO swap space available
  void os::thread_local_storage_at_put(int index, void* value) {
    // %%% this is used only in threadLocalStorage.cpp
    if (thr_setspecific((thread_key_t)index, value)) {
      if (errno == ENOMEM) {
!        vm_exit_out_of_memory(SMALLINT, "thr_setspecific: out of swap space");
      } else {
        fatal(err_msg("os::thread_local_storage_at_put: thr_setspecific failed "
                      "(%s)", strerror(errno)));
      }
    } else {
--- 1621,1632 ----
                        // small number - point is NO swap space available
  void os::thread_local_storage_at_put(int index, void* value) {
    // %%% this is used only in threadLocalStorage.cpp
    if (thr_setspecific((thread_key_t)index, value)) {
      if (errno == ENOMEM) {
!        vm_exit_out_of_memory(SMALLINT, OOM_MALLOC_ERROR,
!                              "thr_setspecific: out of swap space");
      } else {
        fatal(err_msg("os::thread_local_storage_at_put: thr_setspecific failed "
                      "(%s)", strerror(errno)));
      }
    } else {