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

8162461: Hang due to JNI up-call made whilst holding JNI critical lock

Browse Source 
Reviewed-by: prr, psadhukhan
This commit is contained in:
Jayathirth D V 2016-09-14 12:13:46 +05:30
parent 3a0c7b8644
commit 490797cd1a
1 changed files with 57 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2016, 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
@ -553,30 +553,43 @@ sun_jpeg_error_exit (j_common_ptr cinfo)
METHODDEF(void)
sun_jpeg_output_message (j_common_ptr cinfo)
{
char buffer[JMSG_LENGTH_MAX];
jstring string;
imageIODataPtr data = (imageIODataPtr) cinfo->client_data;
JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
jobject theObject;
char buffer[JMSG_LENGTH_MAX];
jstring string;
imageIODataPtr data = (imageIODataPtr) cinfo->client_data;
JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
jobject theObject;
/* Create the message */
(*cinfo->err->format_message) (cinfo, buffer);
/* Create the message */
(*cinfo->err->format_message) (cinfo, buffer);
// Create a new java string from the message
string = (*env)->NewStringUTF(env, buffer);
CHECK_NULL(string);
// Create a new java string from the message
string = (*env)->NewStringUTF(env, buffer);
CHECK_NULL(string);
theObject = data->imageIOobj;
theObject = data->imageIOobj;
if (cinfo->is_decompressor) {
(*env)->CallVoidMethod(env, theObject,
JPEGImageReader_warningWithMessageID,
string);
} else {
(*env)->CallVoidMethod(env, theObject,
JPEGImageWriter_warningWithMessageID,
string);
}
if (cinfo->is_decompressor) {
struct jpeg_source_mgr *src = ((j_decompress_ptr)cinfo)->src;
RELEASE_ARRAYS(env, data, src->next_input_byte);
(*env)->CallVoidMethod(env, theObject,
JPEGImageReader_warningWithMessageID,
string);
if ((*env)->ExceptionOccurred(env)
|| !GET_ARRAYS(env, data, &(src->next_input_byte))) {
cinfo->err->error_exit(cinfo);
}
} else {
struct jpeg_destination_mgr *dest = ((j_compress_ptr)cinfo)->dest;
RELEASE_ARRAYS(env, data, (const JOCTET *)(dest->next_output_byte));
(*env)->CallVoidMethod(env, theObject,
JPEGImageWriter_warningWithMessageID,
string);
if ((*env)->ExceptionOccurred(env)
|| !GET_ARRAYS(env, data,
(const JOCTET **)(&dest->next_output_byte))) {
cinfo->err->error_exit(cinfo);
}
}
}
/* End of verbatim copy from jpegdecoder.c */
@ -1043,6 +1056,7 @@ imageio_fill_suspended_buffer(j_decompress_ptr cinfo)
if (!GET_ARRAYS(env, data, &(src->next_input_byte))) {
cinfo->err->error_exit((j_common_ptr) cinfo);
}
RELEASE_ARRAYS(env, data, src->next_input_byte);
return;
}
@ -1798,9 +1812,14 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_readImageHeader
cinfo->out_color_space,
cinfo->num_components,
profileData);
if ((*env)->ExceptionOccurred(env)
|| !GET_ARRAYS(env, data, &(src->next_input_byte))) {
cinfo->err->error_exit((j_common_ptr) cinfo);
}
if (reset) {
jpeg_abort_decompress(cinfo);
}
RELEASE_ARRAYS(env, data, src->next_input_byte);
}
return retval;
@ -2010,6 +2029,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_readImage
jpeg_start_decompress(cinfo);
if (numBands != cinfo->output_components) {
RELEASE_ARRAYS(env, data, src->next_input_byte);
JNU_ThrowByName(env, "javax/imageio/IIOException",
"Invalid argument to native readImage");
return data->abortFlag;
@ -2018,6 +2038,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_readImage
if (cinfo->output_components <= 0 ||
cinfo->image_width > (0xffffffffu / (unsigned int)cinfo->output_components))
{
RELEASE_ARRAYS(env, data, src->next_input_byte);
JNU_ThrowByName(env, "javax/imageio/IIOException",
"Invalid number of output components");
return data->abortFlag;
@ -2041,15 +2062,24 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_readImage
// the first interesting pass.
jpeg_start_output(cinfo, cinfo->input_scan_number);
if (wantUpdates) {
RELEASE_ARRAYS(env, data, src->next_input_byte);
(*env)->CallVoidMethod(env, this,
JPEGImageReader_passStartedID,
cinfo->input_scan_number-1);
if ((*env)->ExceptionOccurred(env)
|| !GET_ARRAYS(env, data, &(src->next_input_byte))) {
cinfo->err->error_exit((j_common_ptr) cinfo);
}
}
} else if (wantUpdates) {
RELEASE_ARRAYS(env, data, src->next_input_byte);
(*env)->CallVoidMethod(env, this,
JPEGImageReader_passStartedID,
0);
if ((*env)->ExceptionOccurred(env)
|| !GET_ARRAYS(env, data, &(src->next_input_byte))) {
cinfo->err->error_exit((j_common_ptr) cinfo);
}
}
// Skip until the first interesting line
@ -2137,8 +2167,13 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_readImage
done = TRUE;
}
if (wantUpdates) {
RELEASE_ARRAYS(env, data, src->next_input_byte);
(*env)->CallVoidMethod(env, this,
JPEGImageReader_passCompleteID);
if ((*env)->ExceptionOccurred(env)
|| !GET_ARRAYS(env, data, &(src->next_input_byte))) {
cinfo->err->error_exit((j_common_ptr) cinfo);
}
}
}
@ -2837,7 +2872,6 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage
if (setjmp(jerr->setjmp_buffer)) {
/* If we get here, the JPEG code has signaled an error
while writing. */
RELEASE_ARRAYS(env, data, (const JOCTET *)(dest->next_output_byte));
if (!(*env)->ExceptionOccurred(env)) {
char buffer[JMSG_LENGTH_MAX];
(*cinfo->err->format_message) ((j_common_ptr) cinfo,