stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8341794: Fix ExceptionOccurred in jdk.attach

Browse Source 
Reviewed-by: amenkov, cjplummer
This commit is contained in:
Justin Lu 2024-10-11 21:30:53 +00:00
parent 3f53d57134
commit c4965d9b13
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jdk.attach/windows/native/libattach/VirtualMachineImpl.c
View File

@ -432,7 +432,7 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_enqueue
return; return;
} }
} }
if ((*env)->ExceptionOccurred(env)) return; if ((*env)->ExceptionCheck(env)) return;
} }
} }
for (i = argsLen; i < MAX_ARGS; i++) { for (i = argsLen; i < MAX_ARGS; i++) {
@ -463,7 +463,7 @@ JNIEXPORT void JNICALL Java_sun_tools_attach_VirtualMachineImpl_enqueue
stubLen = (DWORD)(*env)->GetArrayLength(env, stub); stubLen = (DWORD)(*env)->GetArrayLength(env, stub);
stubCode = (*env)->GetByteArrayElements(env, stub, &isCopy); stubCode = (*env)->GetByteArrayElements(env, stub, &isCopy);
if ((*env)->ExceptionOccurred(env)) return; if ((*env)->ExceptionCheck(env)) return;
pCode = (PDWORD) VirtualAllocEx( hProcess, 0, stubLen, MEM_COMMIT, PAGE_EXECUTE_READWRITE ); pCode = (PDWORD) VirtualAllocEx( hProcess, 0, stubLen, MEM_COMMIT, PAGE_EXECUTE_READWRITE );
if (pCode == NULL) { if (pCode == NULL) {
@ -636,7 +636,7 @@ static jboolean jstring_to_cstring(JNIEnv* env, jstring jstr, char* cstr, size_t
cstr[0] = '\0'; cstr[0] = '\0';
} else { } else {
str = JNU_GetStringPlatformChars(env, jstr, &isCopy); str = JNU_GetStringPlatformChars(env, jstr, &isCopy);
if ((*env)->ExceptionOccurred(env)) { if ((*env)->ExceptionCheck(env)) {
return result; return result;
} }
if (strlen(str) >= cstr_buf_size) { if (strlen(str) >= cstr_buf_size) {