author | chegar |
Thu, 17 Oct 2019 20:54:25 +0100 | |
branch | datagramsocketimpl-branch |
changeset 58679 | 9c3209ff7550 |
parent 58678 | 9cf78a70fa4f |
parent 58513 | 7605e97c9491 |
permissions | -rw-r--r-- |
2 | 1 |
/* |
55331
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
2 |
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. |
2 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
5506 | 7 |
* published by the Free Software Foundation. Oracle designates this |
2 | 8 |
* particular file as subject to the "Classpath" exception as provided |
5506 | 9 |
* by Oracle in the LICENSE file that accompanied this code. |
2 | 10 |
* |
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
5506 | 21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
2 | 24 |
*/ |
25 |
||
26 |
/* |
|
27 |
* Native method support for java.util.zip.Deflater |
|
28 |
*/ |
|
29 |
||
30 |
#include <stdio.h> |
|
31 |
#include <stdlib.h> |
|
32 |
#include "jlong.h" |
|
33 |
#include "jni.h" |
|
34 |
#include "jni_util.h" |
|
13567
b124faa29aef
7110151: Use underlying platform's zlib library for Java zlib support
andrew
parents:
13409
diff
changeset
|
35 |
#include <zlib.h> |
2 | 36 |
|
37 |
#include "java_util_zip_Deflater.h" |
|
38 |
||
39 |
#define DEF_MEM_LEVEL 8 |
|
40 |
||
41 |
JNIEXPORT jlong JNICALL |
|
42 |
Java_java_util_zip_Deflater_init(JNIEnv *env, jclass cls, jint level, |
|
43 |
jint strategy, jboolean nowrap) |
|
44 |
{ |
|
45 |
z_stream *strm = calloc(1, sizeof(z_stream)); |
|
46 |
||
47 |
if (strm == 0) { |
|
48 |
JNU_ThrowOutOfMemoryError(env, 0); |
|
49 |
return jlong_zero; |
|
50 |
} else { |
|
28258
381e960842b6
8068338: Better message about incompatible zlib in Deflater.init
igerasim
parents:
25859
diff
changeset
|
51 |
const char *msg; |
381e960842b6
8068338: Better message about incompatible zlib in Deflater.init
igerasim
parents:
25859
diff
changeset
|
52 |
int ret = deflateInit2(strm, level, Z_DEFLATED, |
381e960842b6
8068338: Better message about incompatible zlib in Deflater.init
igerasim
parents:
25859
diff
changeset
|
53 |
nowrap ? -MAX_WBITS : MAX_WBITS, |
381e960842b6
8068338: Better message about incompatible zlib in Deflater.init
igerasim
parents:
25859
diff
changeset
|
54 |
DEF_MEM_LEVEL, strategy); |
381e960842b6
8068338: Better message about incompatible zlib in Deflater.init
igerasim
parents:
25859
diff
changeset
|
55 |
switch (ret) { |
2 | 56 |
case Z_OK: |
57 |
return ptr_to_jlong(strm); |
|
58 |
case Z_MEM_ERROR: |
|
59 |
free(strm); |
|
60 |
JNU_ThrowOutOfMemoryError(env, 0); |
|
61 |
return jlong_zero; |
|
62 |
case Z_STREAM_ERROR: |
|
63 |
free(strm); |
|
64 |
JNU_ThrowIllegalArgumentException(env, 0); |
|
65 |
return jlong_zero; |
|
66 |
default: |
|
28258
381e960842b6
8068338: Better message about incompatible zlib in Deflater.init
igerasim
parents:
25859
diff
changeset
|
67 |
msg = ((strm->msg != NULL) ? strm->msg : |
381e960842b6
8068338: Better message about incompatible zlib in Deflater.init
igerasim
parents:
25859
diff
changeset
|
68 |
(ret == Z_VERSION_ERROR) ? |
381e960842b6
8068338: Better message about incompatible zlib in Deflater.init
igerasim
parents:
25859
diff
changeset
|
69 |
"zlib returned Z_VERSION_ERROR: " |
381e960842b6
8068338: Better message about incompatible zlib in Deflater.init
igerasim
parents:
25859
diff
changeset
|
70 |
"compile time and runtime zlib implementations differ" : |
381e960842b6
8068338: Better message about incompatible zlib in Deflater.init
igerasim
parents:
25859
diff
changeset
|
71 |
"unknown error initializing zlib library"); |
2 | 72 |
free(strm); |
73 |
JNU_ThrowInternalError(env, msg); |
|
74 |
return jlong_zero; |
|
75 |
} |
|
76 |
} |
|
77 |
} |
|
78 |
||
55331
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
79 |
static void checkSetDictionaryResult(JNIEnv *env, jlong addr, jint res) |
2 | 80 |
{ |
81 |
switch (res) { |
|
82 |
case Z_OK: |
|
83 |
break; |
|
84 |
case Z_STREAM_ERROR: |
|
85 |
JNU_ThrowIllegalArgumentException(env, 0); |
|
86 |
break; |
|
87 |
default: |
|
5173 | 88 |
JNU_ThrowInternalError(env, ((z_stream *)jlong_to_ptr(addr))->msg); |
2 | 89 |
break; |
90 |
} |
|
91 |
} |
|
92 |
||
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
93 |
JNIEXPORT void JNICALL |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
94 |
Java_java_util_zip_Deflater_setDictionary(JNIEnv *env, jclass cls, jlong addr, |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
95 |
jbyteArray b, jint off, jint len) |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
96 |
{ |
55331
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
97 |
int res; |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
98 |
Bytef *buf = (*env)->GetPrimitiveArrayCritical(env, b, 0); |
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
99 |
if (buf == NULL) /* out of memory */ |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
100 |
return; |
55331
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
101 |
res = deflateSetDictionary(jlong_to_ptr(addr), buf, len); |
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
102 |
(*env)->ReleasePrimitiveArrayCritical(env, b, buf, 0); |
55331
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
103 |
checkSetDictionaryResult(env, addr, res); |
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
104 |
} |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
105 |
|
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
106 |
JNIEXPORT void JNICALL |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
107 |
Java_java_util_zip_Deflater_setDictionaryBuffer(JNIEnv *env, jclass cls, jlong addr, |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
108 |
jlong bufferAddr, jint len) |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
109 |
{ |
55331
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
110 |
int res; |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
111 |
Bytef *buf = jlong_to_ptr(bufferAddr); |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
112 |
res = deflateSetDictionary(jlong_to_ptr(addr), buf, len); |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
113 |
checkSetDictionaryResult(env, addr, res); |
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
114 |
} |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
115 |
|
55331
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
116 |
static jint doDeflate(JNIEnv *env, jlong addr, |
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
117 |
jbyte *input, jint inputLen, |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
118 |
jbyte *output, jint outputLen, |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
119 |
jint flush, jint params) |
2 | 120 |
{ |
5173 | 121 |
z_stream *strm = jlong_to_ptr(addr); |
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
122 |
int setParams = params & 1; |
55331
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
123 |
int res; |
2 | 124 |
|
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
125 |
strm->next_in = (Bytef *) input; |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
126 |
strm->next_out = (Bytef *) output; |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
127 |
strm->avail_in = inputLen; |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
128 |
strm->avail_out = outputLen; |
2 | 129 |
|
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
130 |
if (setParams) { |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
131 |
int strategy = (params >> 1) & 3; |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
132 |
int level = params >> 3; |
55331
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
133 |
res = deflateParams(strm, level, strategy); |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
134 |
} else { |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
135 |
res = deflate(strm, flush); |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
136 |
} |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
137 |
return res; |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
138 |
} |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
139 |
|
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
140 |
static jlong checkDeflateStatus(JNIEnv *env, jlong addr, |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
141 |
jint inputLen, |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
142 |
jint outputLen, |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
143 |
jint params, int res) |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
144 |
{ |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
145 |
z_stream *strm = jlong_to_ptr(addr); |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
146 |
jint inputUsed = 0, outputUsed = 0; |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
147 |
int finished = 0; |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
148 |
int setParams = params & 1; |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
149 |
|
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
150 |
if (setParams) { |
5173 | 151 |
switch (res) { |
152 |
case Z_OK: |
|
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
153 |
setParams = 0; |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
154 |
/* fall through */ |
48045
d66e420cc482
8191918: tomcat gzip-compressed response bodies appear to be broken in update 151
sherman
parents:
47216
diff
changeset
|
155 |
case Z_BUF_ERROR: |
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
156 |
inputUsed = inputLen - strm->avail_in; |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
157 |
outputUsed = outputLen - strm->avail_out; |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
158 |
break; |
5173 | 159 |
default: |
160 |
JNU_ThrowInternalError(env, strm->msg); |
|
161 |
return 0; |
|
162 |
} |
|
163 |
} else { |
|
164 |
switch (res) { |
|
165 |
case Z_STREAM_END: |
|
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
166 |
finished = 1; |
5173 | 167 |
/* fall through */ |
168 |
case Z_OK: |
|
48045
d66e420cc482
8191918: tomcat gzip-compressed response bodies appear to be broken in update 151
sherman
parents:
47216
diff
changeset
|
169 |
case Z_BUF_ERROR: |
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
170 |
inputUsed = inputLen - strm->avail_in; |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
171 |
outputUsed = outputLen - strm->avail_out; |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
172 |
break; |
48045
d66e420cc482
8191918: tomcat gzip-compressed response bodies appear to be broken in update 151
sherman
parents:
47216
diff
changeset
|
173 |
default: |
5173 | 174 |
JNU_ThrowInternalError(env, strm->msg); |
175 |
return 0; |
|
2 | 176 |
} |
177 |
} |
|
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
178 |
return ((jlong)inputUsed) | (((jlong)outputUsed) << 31) | (((jlong)finished) << 62) | (((jlong)setParams) << 63); |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
179 |
} |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
180 |
|
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
181 |
JNIEXPORT jlong JNICALL |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
182 |
Java_java_util_zip_Deflater_deflateBytesBytes(JNIEnv *env, jobject this, jlong addr, |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
183 |
jbyteArray inputArray, jint inputOff, jint inputLen, |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
184 |
jbyteArray outputArray, jint outputOff, jint outputLen, |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
185 |
jint flush, jint params) |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
186 |
{ |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
187 |
jbyte *input = (*env)->GetPrimitiveArrayCritical(env, inputArray, 0); |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
188 |
jbyte *output; |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
189 |
jlong retVal; |
55331
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
190 |
jint res; |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
191 |
|
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
192 |
if (input == NULL) { |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
193 |
if (inputLen != 0 && (*env)->ExceptionOccurred(env) == NULL) |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
194 |
JNU_ThrowOutOfMemoryError(env, 0); |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
195 |
return 0L; |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
196 |
} |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
197 |
output = (*env)->GetPrimitiveArrayCritical(env, outputArray, 0); |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
198 |
if (output == NULL) { |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
199 |
(*env)->ReleasePrimitiveArrayCritical(env, inputArray, input, 0); |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
200 |
if (outputLen != 0 && (*env)->ExceptionOccurred(env) == NULL) |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
201 |
JNU_ThrowOutOfMemoryError(env, 0); |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
202 |
return 0L; |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
203 |
} |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
204 |
|
55331
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
205 |
res = doDeflate(env, addr, input + inputOff, inputLen,output + outputOff, |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
206 |
outputLen, flush, params); |
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
207 |
|
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
208 |
(*env)->ReleasePrimitiveArrayCritical(env, outputArray, output, 0); |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
209 |
(*env)->ReleasePrimitiveArrayCritical(env, inputArray, input, 0); |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
210 |
|
55331
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
211 |
retVal = checkDeflateStatus(env, addr, inputLen, outputLen, params, res); |
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
212 |
return retVal; |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
213 |
} |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
214 |
|
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
215 |
|
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
216 |
JNIEXPORT jlong JNICALL |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
217 |
Java_java_util_zip_Deflater_deflateBytesBuffer(JNIEnv *env, jobject this, jlong addr, |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
218 |
jbyteArray inputArray, jint inputOff, jint inputLen, |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
219 |
jlong outputBuffer, jint outputLen, |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
220 |
jint flush, jint params) |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
221 |
{ |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
222 |
jbyte *input = (*env)->GetPrimitiveArrayCritical(env, inputArray, 0); |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
223 |
jbyte *output; |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
224 |
jlong retVal; |
55331
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
225 |
jint res; |
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
226 |
if (input == NULL) { |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
227 |
if (inputLen != 0 && (*env)->ExceptionOccurred(env) == NULL) |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
228 |
JNU_ThrowOutOfMemoryError(env, 0); |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
229 |
return 0L; |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
230 |
} |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
231 |
output = jlong_to_ptr(outputBuffer); |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
232 |
|
55331
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
233 |
res = doDeflate(env, addr, input + inputOff, inputLen, output, outputLen, |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
234 |
flush, params); |
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
235 |
|
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
236 |
(*env)->ReleasePrimitiveArrayCritical(env, inputArray, input, 0); |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
237 |
|
55331
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
238 |
retVal = checkDeflateStatus(env, addr, inputLen, outputLen, params, res); |
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
239 |
return retVal; |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
240 |
} |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
241 |
|
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
242 |
JNIEXPORT jlong JNICALL |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
243 |
Java_java_util_zip_Deflater_deflateBufferBytes(JNIEnv *env, jobject this, jlong addr, |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
244 |
jlong inputBuffer, jint inputLen, |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
245 |
jbyteArray outputArray, jint outputOff, jint outputLen, |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
246 |
jint flush, jint params) |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
247 |
{ |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
248 |
jbyte *input = jlong_to_ptr(inputBuffer); |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
249 |
jbyte *output = (*env)->GetPrimitiveArrayCritical(env, outputArray, 0); |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
250 |
jlong retVal; |
55331
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
251 |
jint res; |
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
252 |
if (output == NULL) { |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
253 |
if (outputLen != 0 && (*env)->ExceptionOccurred(env) == NULL) |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
254 |
JNU_ThrowOutOfMemoryError(env, 0); |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
255 |
return 0L; |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
256 |
} |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
257 |
|
55331
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
258 |
res = doDeflate(env, addr, input, inputLen, output + outputOff, outputLen, |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
259 |
flush, params); |
58513
7605e97c9491
8231770: Test java/util/zip/FlaterTest.java fails with -Xcheck:jni
coffeys
parents:
55331
diff
changeset
|
260 |
(*env)->ReleasePrimitiveArrayCritical(env, outputArray, output, 0); |
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
261 |
|
55331
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
262 |
retVal = checkDeflateStatus(env, addr, inputLen, outputLen, params, res); |
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
263 |
return retVal; |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
264 |
} |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
265 |
|
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
266 |
JNIEXPORT jlong JNICALL |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
267 |
Java_java_util_zip_Deflater_deflateBufferBuffer(JNIEnv *env, jobject this, jlong addr, |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
268 |
jlong inputBuffer, jint inputLen, |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
269 |
jlong outputBuffer, jint outputLen, |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
270 |
jint flush, jint params) |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
271 |
{ |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
272 |
jbyte *input = jlong_to_ptr(inputBuffer); |
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
273 |
jbyte *output = jlong_to_ptr(outputBuffer); |
55331
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
274 |
jlong retVal; |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
275 |
jint res; |
49834
99644c75eaed
6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents:
48045
diff
changeset
|
276 |
|
55331
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
277 |
res = doDeflate(env, addr, input, inputLen, output, outputLen, flush, params); |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
278 |
retVal = checkDeflateStatus(env, addr, inputLen, outputLen, params, res); |
dbf5cda9843d
8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents:
49834
diff
changeset
|
279 |
return retVal; |
2 | 280 |
} |
281 |
||
282 |
JNIEXPORT jint JNICALL |
|
5173 | 283 |
Java_java_util_zip_Deflater_getAdler(JNIEnv *env, jclass cls, jlong addr) |
2 | 284 |
{ |
5173 | 285 |
return ((z_stream *)jlong_to_ptr(addr))->adler; |
2 | 286 |
} |
287 |
||
288 |
JNIEXPORT void JNICALL |
|
5173 | 289 |
Java_java_util_zip_Deflater_reset(JNIEnv *env, jclass cls, jlong addr) |
2 | 290 |
{ |
5173 | 291 |
if (deflateReset((z_stream *)jlong_to_ptr(addr)) != Z_OK) { |
2 | 292 |
JNU_ThrowInternalError(env, 0); |
293 |
} |
|
294 |
} |
|
295 |
||
296 |
JNIEXPORT void JNICALL |
|
5173 | 297 |
Java_java_util_zip_Deflater_end(JNIEnv *env, jclass cls, jlong addr) |
2 | 298 |
{ |
5173 | 299 |
if (deflateEnd((z_stream *)jlong_to_ptr(addr)) == Z_STREAM_ERROR) { |
2 | 300 |
JNU_ThrowInternalError(env, 0); |
301 |
} else { |
|
5173 | 302 |
free((z_stream *)jlong_to_ptr(addr)); |
2 | 303 |
} |
304 |
} |