Skip to content

8286331: jni_GetStringUTFChars() uses wrong heap allocator #1401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
shipilev wants to merge 3 commits into from
Closed

8286331: jni_GetStringUTFChars() uses wrong heap allocator #1401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97a99a2
Backport 64b05ccbed7879dd38a49453a6098bfe9729ee76
shipilev May 25, 2023
263ed82
Backport b0d2b0a3553cbb2db23d543b98ab1401b3dbfa91
shipilev May 25, 2023
9e760fd
Merge branch 'master' into JDK-8286331-jni-getstringutfchars-wronghea…
shipilev May 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/hotspot/share/prims/jni.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2234,7 +2234,7 @@ JNI_ENTRY(const char*, jni_GetStringUTFChars(JNIEnv *env, jstring string, jboole
if (s_value != NULL) {
size_t length = java_lang_String::utf8_length(java_string, s_value);
/* JNI Specification states return NULL on OOM */
result = AllocateHeap(length + 1, mtInternal, 0, AllocFailStrategy::RETURN_NULL);
result = AllocateHeap(length + 1, mtInternal, AllocFailStrategy::RETURN_NULL);
if (result != NULL) {
java_lang_String::as_utf8_string(java_string, s_value, result, (int) length + 1);
if (isCopy != NULL) {
Expand Down
4 changes: 2 additions & 2 deletions src/hotspot/share/utilities/nativeCallStack.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -64,7 +64,7 @@ class NativeCallStack : public StackObj {
memset(_stack, 0, sizeof(_stack));
}

NativeCallStack(int toSkip);
explicit NativeCallStack(int toSkip);
NativeCallStack(address* pc, int frameCount);

static inline const NativeCallStack& empty_stack() { return _empty_stack; }
Expand Down