mirror of
https://git.freebsd.org/ports.git
synced 2025-06-13 16:50:29 -04:00
a47b284421
During an exp-run for llvm 12 (see bug 255570), it turned out that
java/openjdk11 and java/openjdk11-jre do not build with clang 12.0.0:
Creating interim jimage
Compiling 2 files for BUILD_DEMO_Notepad
This is due to a missing backport of an upstream commit:
commit c484d8904285652246c3af212a4211b9a8955149
Author: Thomas Stuefe <stuefe@openjdk.org>
Date: Tue Mar 16 05:49:01 2021 +0000
8263557: Possible NULL dereference in Arena::destruct_contents()
Reviewed-by: kbarrett, coleenp
Approved by: maintainer timeout (2 weeks)
PR: 255900
MFH: 2021Q2
23 lines
731 B
Text
23 lines
731 B
Text
commit c484d8904285652246c3af212a4211b9a8955149
|
|
Author: Thomas Stuefe <stuefe@openjdk.org>
|
|
Date: Tue Mar 16 05:49:01 2021 +0000
|
|
|
|
8263557: Possible NULL dereference in Arena::destruct_contents()
|
|
|
|
Reviewed-by: kbarrett, coleenp
|
|
|
|
diff --git src/hotspot/share/memory/arena.cpp src/hotspot/share/memory/arena.cpp
|
|
index 8388f68c359..16059bed9be 100644
|
|
--- src/hotspot/share/memory/arena.cpp
|
|
+++ src/hotspot/share/memory/arena.cpp
|
|
@@ -310,7 +310,9 @@ void Arena::destruct_contents() {
|
|
// reset size before chop to avoid a rare racing condition
|
|
// that can have total arena memory exceed total chunk memory
|
|
set_size_in_bytes(0);
|
|
- _first->chop();
|
|
+ if (_first != NULL) {
|
|
+ _first->chop();
|
|
+ }
|
|
reset();
|
|
}
|
|
|