diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2021-05-15 14:45:59 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2021-05-29 14:08:18 +0000 |
| commit | d6f8398fa2774d0e8eb6ab29b40b6ef0b16ba133 (patch) | |
| tree | 11ff2b149caf6c2ff9ffc3fec5639a0f34a6cfe4 /java/openjdk12 | |
| parent | a47b2844217978a9b577182214c795dbfe471451 (diff) | |
| download | ports-d6f8398fa2774d0e8eb6ab29b40b6ef0b16ba133.tar.gz ports-d6f8398fa2774d0e8eb6ab29b40b6ef0b16ba133.zip | |
Diffstat (limited to 'java/openjdk12')
| -rw-r--r-- | java/openjdk12/files/patch-commit-34ae46e2bca | 23 | ||||
| -rw-r--r-- | java/openjdk12/files/patch-commit-c484d890428 | 23 |
2 files changed, 46 insertions, 0 deletions
diff --git a/java/openjdk12/files/patch-commit-34ae46e2bca b/java/openjdk12/files/patch-commit-34ae46e2bca new file mode 100644 index 000000000000..3b70042a5487 --- /dev/null +++ b/java/openjdk12/files/patch-commit-34ae46e2bca @@ -0,0 +1,23 @@ +commit 34ae46e2bca691f989d4d84129baf545ff8a7469 +Author: Andrew Haley <aph@openjdk.org> +Date: Thu Mar 19 14:53:57 2020 +0000 + + 8241296: Segfault in JNIHandleBlock::oops_do() + + Reviewed-by: stefank + +diff --git src/hotspot/share/runtime/thread.cpp src/hotspot/share/runtime/thread.cpp +index b93e70a0353..b1571f2d594 100644 +--- src/hotspot/share/runtime/thread.cpp ++++ src/hotspot/share/runtime/thread.cpp +@@ -888,7 +888,9 @@ bool Thread::claim_par_threads_do(uintx claim_token) { + } + + void Thread::oops_do(OopClosure* f, CodeBlobClosure* cf) { +- active_handles()->oops_do(f); ++ if (active_handles() != NULL) { ++ active_handles()->oops_do(f); ++ } + // Do oop for ThreadShadow + f->do_oop((oop*)&_pending_exception); + handle_area()->oops_do(f); diff --git a/java/openjdk12/files/patch-commit-c484d890428 b/java/openjdk12/files/patch-commit-c484d890428 new file mode 100644 index 000000000000..39ac7a7e8e46 --- /dev/null +++ b/java/openjdk12/files/patch-commit-c484d890428 @@ -0,0 +1,23 @@ +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(); + } + |