From d0949c82fd2eedc983e85fd86a9ce7d430e574a7 Mon Sep 17 00:00:00 2001
From: Antonio Vieiro <avieirov@redhat.com>
Date: Mon, 18 Nov 2024 22:43:17 +0000
Subject: [PATCH] 8332935: Crash: assert(*lastPtr != 0) failed: Mismatched
JNINativeInterface tables, check for new entries
Backport-of: 90699828478fe0a1307ad68cc0cb368fe4db890e
---
src/hotspot/share/prims/jniCheck.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/hotspot/share/prims/jniCheck.cpp b/src/hotspot/share/prims/jniCheck.cpp
index 52fa413fa1f..490edb45318 100644
--- a/src/hotspot/share/prims/jniCheck.cpp
+++ b/src/hotspot/share/prims/jniCheck.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2024, 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
@@ -2316,7 +2316,7 @@ struct JNINativeInterface_* jni_functions_check() {
// make sure the last pointer in the checked table is not null, indicating
// an addition to the JNINativeInterface_ structure without initializing
// it in the checked table.
- debug_only(int *lastPtr = (int *)((char *)&checked_jni_NativeInterface + \
+ debug_only(intptr_t *lastPtr = (intptr_t *)((char *)&checked_jni_NativeInterface + \
sizeof(*unchecked_jni_NativeInterface) - sizeof(char *));)
assert(*lastPtr != 0,
"Mismatched JNINativeInterface tables, check for new entries");
--
GitLab