!352 I5RFYT: dynamic cds _header and _fd handles not free

From: @kuenking111 
Reviewed-by: @hserror 
Signed-off-by: @hserror
This commit is contained in:
openeuler-ci-bot 2022-09-16 10:39:23 +00:00 committed by Gitee
commit b3b16c119b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 40 additions and 1 deletions

View File

@ -0,0 +1,34 @@
From cf12a2fae11baf41773308a48d9cfad9031f5344 Mon Sep 17 00:00:00 2001
Date: Fri, 9 Sep 2022 11:26:22 +0800
Subject: dynamic cds _header and _fd handles are not free.
---
hotspot/src/share/vm/memory/filemap.cpp | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/hotspot/src/share/vm/memory/filemap.cpp b/hotspot/src/share/vm/memory/filemap.cpp
index adb043f77..6549828e3 100644
--- a/hotspot/src/share/vm/memory/filemap.cpp
+++ b/hotspot/src/share/vm/memory/filemap.cpp
@@ -169,6 +169,18 @@ FileMapInfo::~FileMapInfo() {
assert(_dynamic_archive_info == this, "must be singleton"); // not thread safe
_dynamic_archive_info = NULL;
}
+
+ if (_header != NULL) {
+ delete _header;
+ }
+
+ if (_file_open) {
+ if (::close(_fd) < 0) {
+ fail_stop("Unable to close the shared archive file.");
+ }
+ _file_open = false;
+ _fd = -1;
+ }
}
void FileMapInfo::populate_header(size_t alignment) {
--
2.22.0

View File

@ -916,7 +916,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver}
Release: 8
Release: 9
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@ -1144,6 +1144,7 @@ Patch254: kae-usability-enhancement.patch
Patch255: Dynamic-CDS-Archive.patch
Patch256: 8202951-Support-default-jsa.patch
Patch257: 8200332-Improve-GCM-counting.patch
Patch258: dynamic-cds-_header-and-_fd-handles-are-not-free.patch
#############################################
#
@ -1628,6 +1629,7 @@ pushd %{top_level_dir_name}
%patch255 -p1
%patch256 -p1
%patch257 -p1
%patch258 -p1
popd
# System library fixes
@ -2252,6 +2254,9 @@ cjc.mainProgram(arg)
%endif
%changelog
* Fri Sep 16 2022 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.342-b07.9
- add dynamic-cds-_header-and-_fd-handles-are-not-free.patch
* Fri Sep 16 2022 kuenking111 <wangkun49@huawei.com> - 1:1.8.0.342-b07.8
- add 8200332-Improve-GCM-counting.patch