infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-07-19 23:48:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

8239070: Memory leak when unsuccessfully mapping in archive regions

Browse Source 
Reviewed-by: kbarrett, iklam, coleenp, jiangli
This commit is contained in:
Thomas Schatzl 2020-02-19 10:04:54 +01:00
parent 6015cab798
commit fff8438af8
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hotspot/share/memory/filemap.cpp
View File

@ -1748,6 +1748,14 @@ void FileMapInfo::map_heap_regions() {
bool FileMapInfo::map_heap_data(MemRegion **heap_mem, int first,
int max, int* num, bool is_open_archive) {
MemRegion* regions = MemRegion::create_array(max, mtInternal);
struct Cleanup {
MemRegion* _regions;
bool _aborted;
Cleanup(MemRegion* regions) : _regions(regions), _aborted(true) { }
~Cleanup() { if (_aborted) { FREE_C_HEAP_ARRAY(MemRegion, _regions); } }
} cleanup(regions);
FileMapRegion* si;
int region_num = 0;
@ -1807,6 +1815,7 @@ bool FileMapInfo::map_heap_data(MemRegion **heap_mem, int first,
}
}
cleanup._aborted = false;
// the shared heap data is mapped successfully
*heap_mem = regions;
*num = region_num;