From 37107fc1574a4191987420d88f7182e63c7da60c Mon Sep 17 00:00:00 2001 From: Dean Long Date: Tue, 1 Nov 2022 00:46:24 +0000 Subject: [PATCH] 8296007: crash in runtime/DefineClass/NullClassBytesTest.java Reviewed-by: dcubed, dholmes --- .../jtreg/runtime/DefineClass/libNullClassBytesTest.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/hotspot/jtreg/runtime/DefineClass/libNullClassBytesTest.c b/test/hotspot/jtreg/runtime/DefineClass/libNullClassBytesTest.c index eb0a8994793..92e51186153 100644 --- a/test/hotspot/jtreg/runtime/DefineClass/libNullClassBytesTest.c +++ b/test/hotspot/jtreg/runtime/DefineClass/libNullClassBytesTest.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 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 @@ -23,7 +23,7 @@ #include -JNIEXPORT void JNICALL +JNIEXPORT jclass JNICALL Java_NullClassBytesTest_nativeDefineClass(JNIEnv *env, jclass klass, jstring className, jobject ldr, jbyte* class_bytes, jint length) { if (class_bytes == NULL) { @@ -32,8 +32,8 @@ Java_NullClassBytesTest_nativeDefineClass(JNIEnv *env, jclass klass, jstring cla if (cls != 0) { (*env)->ThrowNew(env, cls, "class_bytes are null"); } - return; + return NULL; } const char* c_name = (*env)->GetStringUTFChars(env, className, NULL); - (*env)->DefineClass(env, c_name, ldr, class_bytes, length); + return (*env)->DefineClass(env, c_name, ldr, class_bytes, length); }