jdk-sandbox: comparison jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c

equal deleted inserted replaced

-:1e4cc5a20bd1
+:c6a2226cc4de
 }
 data->jpegObj = cinfo;
 cinfo->client_data = data;
-#ifdef DEBUG
+#ifdef DEBUG_IIO_JPEG
 printf("new structures: data is %p, cinfo is %p\n", data, cinfo);
 #endif
 data->imageIOobj = (*env)->NewWeakGlobalRef(env, obj);
 if (data->imageIOobj == NULL) {
 int i, j;
 j_compress_ptr comp;
 j_decompress_ptr decomp;
 qlen = (*env)->GetArrayLength(env, qtables);
-#ifdef DEBUG
+#ifdef DEBUG_IIO_JPEG
 printf("in setQTables, qlen = %d, write is %d\n", qlen, write);
 #endif
 for (i = 0; i < qlen; i++) {
 table = (*env)->GetObjectArrayElement(env, qtables, i);
 qdata = (*env)->GetObjectField(env, table, JPEGQTable_tableID);
 /* This is where input suspends */
 if (sb->suspendable) {
 return FALSE;
 }
-#ifdef DEBUG
+#ifdef DEBUG_IIO_JPEG
 printf("Filling input buffer, remaining skip is %ld, ",
 sb->remaining_skip);
 printf("Buffer length is %d\n", sb->bufferLength);
 #endif
 if ((*env)->ExceptionOccurred(env)
 || !GET_ARRAYS(env, data, &(src->next_input_byte))) {
 cinfo->err->error_exit((j_common_ptr) cinfo);
 }
-#ifdef DEBUG
+#ifdef DEBUG_IIO_JPEG
 printf("Buffer filled. ret = %d\n", ret);
 #endif
 /*
 * If we have reached the end of the stream, then the EOI marker
 * is missing.  We accept such streams but generate a warning.
 * The image is likely to be corrupted, though everything through
 * the end of the last complete MCU should be usable.
 */
 if (ret <= 0) {
 jobject reader = data->imageIOobj;
-#ifdef DEBUG
+#ifdef DEBUG_IIO_JPEG
 printf("YO! Early EOI! ret = %d\n", ret);
 #endif
 RELEASE_ARRAYS(env, data, src->next_input_byte);
 (*env)->CallVoidMethod(env, reader,
 JPEGImageReader_warningOccurredID,
 jbyteArray
 read_icc_profile (JNIEnv *env, j_decompress_ptr cinfo)
 {
 jpeg_saved_marker_ptr marker;
 int num_markers = 0;
+int num_found_markers = 0;
 int seq_no;
 JOCTET *icc_data;
+JOCTET *dst_ptr;
 unsigned int total_length;
 #define MAX_SEQ_NO  255         // sufficient since marker numbers are bytes
-char marker_present[MAX_SEQ_NO+1];    // 1 if marker found
+jpeg_saved_marker_ptr icc_markers[MAX_SEQ_NO + 1];
-unsigned int data_length[MAX_SEQ_NO+1]; // size of profile data in marker
+int first;         // index of the first marker in the icc_markers array
-unsigned int data_offset[MAX_SEQ_NO+1]; // offset for data in marker
+int last;          // index of the last marker in the icc_markers array
 jbyteArray data = NULL;
 /* This first pass over the saved markers discovers whether there are
 * any ICC markers and verifies the consistency of the marker numbering.
 */
-for (seq_no = 1; seq_no <= MAX_SEQ_NO; seq_no++)
+for (seq_no = 0; seq_no <= MAX_SEQ_NO; seq_no++)
-marker_present[seq_no] = 0;
+icc_markers[seq_no] = NULL;
 for (marker = cinfo->marker_list; marker != NULL; marker = marker->next) {
 if (marker_is_icc(marker)) {
 if (num_markers == 0)
 num_markers = GETJOCTET(marker->data[13]);
 JNU_ThrowByName(env, "javax/imageio/IIOException",
 "Invalid icc profile: inconsistent num_markers fields");
 return NULL;
 }
 seq_no = GETJOCTET(marker->data[12]);
-if (seq_no <= 0 || seq_no > num_markers) {
+/* Some third-party tools produce images with profile chunk
+* numeration started from zero. It is inconsistent with ICC
+* spec, but seems to be recognized by majority of image
+* processing tools, so we should be more tolerant to this
+* departure from the spec.
+*/
+if (seq_no < 0 || seq_no > num_markers) {
 JNU_ThrowByName(env, "javax/imageio/IIOException",
 "Invalid icc profile: bad sequence number");
 return NULL;
 }
-if (marker_present[seq_no]) {
+if (icc_markers[seq_no] != NULL) {
 JNU_ThrowByName(env, "javax/imageio/IIOException",
 "Invalid icc profile: duplicate sequence numbers");
 return NULL;
 }
-marker_present[seq_no] = 1;
+icc_markers[seq_no] = marker;
-data_length[seq_no] = marker->data_length - ICC_OVERHEAD_LEN;
+num_found_markers ++;
 }
 }
 if (num_markers == 0)
 return NULL;  // There is no profile
-/* Check for missing markers, count total space needed,
+if (num_markers != num_found_markers) {
-* compute offset of each marker's part of the data.
+JNU_ThrowByName(env, "javax/imageio/IIOException",
+"Invalid icc profile: invalid number of icc markers");
+return NULL;
+}
+first = icc_markers[0] ? 0 : 1;
+last = num_found_markers + first;
+/* Check for missing markers, count total space needed.
 */
 total_length = 0;
-for (seq_no = 1; seq_no <= num_markers; seq_no++) {
+for (seq_no = first; seq_no < last; seq_no++) {
-if (marker_present[seq_no] == 0) {
+unsigned int length;
+if (icc_markers[seq_no] == NULL) {
 JNU_ThrowByName(env, "javax/imageio/IIOException",
 "Invalid icc profile: missing sequence number");
 return NULL;
 }
-data_offset[seq_no] = total_length;
+/* check the data length correctness */
-total_length += data_length[seq_no];
+length = icc_markers[seq_no]->data_length;
+if (ICC_OVERHEAD_LEN > length || length > MAX_BYTES_IN_MARKER) {
+JNU_ThrowByName(env, "javax/imageio/IIOException",
+"Invalid icc profile: invalid data length");
+return NULL;
+}
+total_length += (length - ICC_OVERHEAD_LEN);
 }
 if (total_length <= 0) {
 JNU_ThrowByName(env, "javax/imageio/IIOException",
 "Invalid icc profile: found only empty markers");
 "Unable to pin icc profile data array");
 return NULL;
 }
 /* and fill it in */
-for (marker = cinfo->marker_list; marker != NULL; marker = marker->next) {
+dst_ptr = icc_data;
-if (marker_is_icc(marker)) {
+for (seq_no = first; seq_no < last; seq_no++) {
-JOCTET FAR *src_ptr;
+JOCTET FAR *src_ptr = icc_markers[seq_no]->data + ICC_OVERHEAD_LEN;
-JOCTET *dst_ptr;
+unsigned int length =
-unsigned int length;
+icc_markers[seq_no]->data_length - ICC_OVERHEAD_LEN;
-seq_no = GETJOCTET(marker->data[12]);
-dst_ptr = icc_data + data_offset[seq_no];
+memcpy(dst_ptr, src_ptr, length);
-src_ptr = marker->data + ICC_OVERHEAD_LEN;
+dst_ptr += length;
-length = data_length[seq_no];
-while (length--) {
-*dst_ptr++ = *src_ptr++;
-}
-}
 }
 /* finally, unpin the array */
 (*env)->ReleasePrimitiveArrayCritical(env,
 data,
 jboolean retval = JNI_FALSE;
 imageIODataPtr data = (imageIODataPtr) ptr;
 j_decompress_ptr cinfo;
 struct jpeg_source_mgr *src;
 sun_jpeg_error_ptr jerr;
+jbyteArray profileData = NULL;
 if (data == NULL) {
 JNU_ThrowByName(env,
 "java/lang/IllegalStateException",
 "Attempting to use reader after dispose()");
 JNU_ThrowByName(env, "javax/imageio/IIOException", buffer);
 }
 return retval;
 }
-#ifdef DEBUG
+#ifdef DEBUG_IIO_JPEG
 printf("In readImageHeader, data is %p cinfo is %p\n", data, cinfo);
 printf("clearFirst is %d\n", clearFirst);
 #endif
 if (GET_ARRAYS(env, data, &src->next_input_byte) == NOT_OK) {
 ret = jpeg_read_header(cinfo, FALSE);
 if (ret == JPEG_HEADER_TABLES_ONLY) {
 retval = JNI_TRUE;
 imageio_term_source(cinfo);  // Pushback remaining buffer contents
-#ifdef DEBUG
+#ifdef DEBUG_IIO_JPEG
 printf("just read tables-only image; q table 0 at %p\n",
 cinfo->quant_tbl_ptrs[0]);
 #endif
 RELEASE_ARRAYS(env, data, src->next_input_byte);
 } else {
 cinfo->jpeg_color_space = JCS_YCCK;
 /* Leave the output space as CMYK */
 }
 }
 RELEASE_ARRAYS(env, data, src->next_input_byte);
+/* read icc profile data */
+profileData = read_icc_profile(env, cinfo);
+if ((*env)->ExceptionCheck(env)) {
+return retval;
+}
 (*env)->CallVoidMethod(env, this,
 JPEGImageReader_setImageDataID,
 cinfo->image_width,
 cinfo->image_height,
 cinfo->jpeg_color_space,
 cinfo->out_color_space,
 cinfo->num_components,
-read_icc_profile(env, cinfo));
+profileData);
 if (reset) {
 jpeg_abort_decompress(cinfo);
 }
 }
 }
 }
 (*env)->ReleaseIntArrayElements(env, srcBands, body, JNI_ABORT);
-#ifdef DEBUG
+#ifdef DEBUG_IIO_JPEG
 printf("---- in reader.read ----\n");
 printf("numBands is %d\n", numBands);
 printf("bands array: ");
 for (i = 0; i < numBands; i++) {
 printf("%d ", bands[i]);
 jpeg_suppress_tables(cinfo, TRUE);  // Suppress writing of any current
 data->streamBuf.suspendable = FALSE;
 if (qtables != NULL) {
-#ifdef DEBUG
+#ifdef DEBUG_IIO_JPEG
 printf("in writeTables: qtables not NULL\n");
 #endif
 setQTables(env, (j_common_ptr) cinfo, qtables, TRUE);
 }
 }
 }
 cinfo->restart_interval = restartInterval;
-#ifdef DEBUG
+#ifdef DEBUG_IIO_JPEG
 printf("writer setup complete, starting compressor\n");
 #endif
 // start the compressor; tables must already be set
 jpeg_start_compress(cinfo, FALSE); // Leaves sent_table alone
 pixelStride = numBands*stepX;
 for (; in < pixelLimit; in += pixelStride) {
 for (i = 0; i < numBands; i++) {
 if (scale !=NULL && scale[i] != NULL) {
 *out++ = scale[i][*(in+i)];
-#ifdef DEBUG
+#ifdef DEBUG_IIO_JPEG
 if (in == data->pixelBuf.buf.bp){ // Just the first pixel
 printf("in %d -> out %d, ", *(in+i), *(out-i-1));
 }
 #endif
-#ifdef DEBUG
+#ifdef DEBUG_IIO_JPEG
 if (in == data->pixelBuf.buf.bp){ // Just the first pixel
 printf("\n");
 }
 #endif
 } else {

changeset 2383	c6a2226cc4de
parent 2	90ce3da70b43
child 3009	de653b2cab31