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

8199924: Solaris: Correctly enqueue null arguments of attach operations

Browse Source 
Reviewed-by: dcubed, dholmes
This commit is contained in:
Christoph Langer 2018-03-23 09:26:59 +01:00
parent f1f63e1f85
commit 3e5b58e0d7
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -231,7 +231,7 @@ static const char* translate_error(jint err) {
int table_size = sizeof(error_messages) / sizeof(error_messages[0]); int table_size = sizeof(error_messages) / sizeof(error_messages[0]);
int i; int i;
for (i=0; i<table_size; i++) { for (i = 0; i < table_size; i++) {
if (err == error_messages[i].err) { if (err == error_messages[i].err) {
return error_messages[i].msg; return error_messages[i].msg;
} }
@ -293,7 +293,7 @@ JNIEXPORT jint JNICALL Java_sun_tools_attach_VirtualMachineImpl_enqueue
*/ */
arg_count = (*env)->GetArrayLength(env, args); arg_count = (*env)->GetArrayLength(env, args);
for (i=0; i<arg_count; i++) { for (i = 0; i < arg_count; i++) {
jobject obj = (*env)->GetObjectArrayElement(env, args, i); jobject obj = (*env)->GetObjectArrayElement(env, args, i);
if (obj != NULL) { if (obj != NULL) {
cstr = JNU_GetStringPlatformChars(env, obj, &isCopy); cstr = JNU_GetStringPlatformChars(env, obj, &isCopy);
@ -314,6 +314,15 @@ JNIEXPORT jint JNICALL Java_sun_tools_attach_VirtualMachineImpl_enqueue
return -1; return -1;
} }
} }
} else {
char* newbuf = (char*)realloc(buf, size + 1);
if (newbuf == NULL) {
free(buf);
JNU_ThrowOutOfMemoryError(env, "realloc failed");
return -1;
}
buf = newbuf;
buf[size++] = 0;
} }
if ((*env)->ExceptionOccurred(env)) { if ((*env)->ExceptionOccurred(env)) {
free(buf); free(buf);