src/java.base/share/native/libzip/Inflater.c
author lancea
Tue, 11 Jun 2019 13:04:36 -0400
changeset 55331 dbf5cda9843d
parent 49834 99644c75eaed
permissions -rw-r--r--
8225189: Multiple JNI calls within critical region in ZIP Library Reviewed-by: alanb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     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
90ce3da70b43 Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
90ce3da70b43 Initial load
duke
parents:
diff changeset
     4
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
90ce3da70b43 Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5173
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5173
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    10
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
90ce3da70b43 Initial load
duke
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
90ce3da70b43 Initial load
duke
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
90ce3da70b43 Initial load
duke
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
90ce3da70b43 Initial load
duke
parents:
diff changeset
    15
 * accompanied this code).
90ce3da70b43 Initial load
duke
parents:
diff changeset
    16
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
90ce3da70b43 Initial load
duke
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
90ce3da70b43 Initial load
duke
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    20
 *
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5173
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5173
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 5173
diff changeset
    23
 * questions.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    24
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    25
90ce3da70b43 Initial load
duke
parents:
diff changeset
    26
/*
90ce3da70b43 Initial load
duke
parents:
diff changeset
    27
 * Native method support for java.util.zip.Inflater
90ce3da70b43 Initial load
duke
parents:
diff changeset
    28
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    29
16059
f0a29ee25e5b 8008759: Do not let internal JDK zlib symbols leak out of fastdebug libzip.so
martin
parents: 14342
diff changeset
    30
#include <stddef.h>
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    31
#include <stdio.h>
90ce3da70b43 Initial load
duke
parents:
diff changeset
    32
#include <stdlib.h>
90ce3da70b43 Initial load
duke
parents:
diff changeset
    33
#include <errno.h>
90ce3da70b43 Initial load
duke
parents:
diff changeset
    34
#include <string.h>
90ce3da70b43 Initial load
duke
parents:
diff changeset
    35
#include "jlong.h"
90ce3da70b43 Initial load
duke
parents:
diff changeset
    36
#include "jni.h"
90ce3da70b43 Initial load
duke
parents:
diff changeset
    37
#include "jvm.h"
90ce3da70b43 Initial load
duke
parents:
diff changeset
    38
#include "jni_util.h"
13567
b124faa29aef 7110151: Use underlying platform's zlib library for Java zlib support
andrew
parents: 13409
diff changeset
    39
#include <zlib.h>
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    40
#include "java_util_zip_Inflater.h"
90ce3da70b43 Initial load
duke
parents:
diff changeset
    41
90ce3da70b43 Initial load
duke
parents:
diff changeset
    42
#define ThrowDataFormatException(env, msg) \
90ce3da70b43 Initial load
duke
parents:
diff changeset
    43
        JNU_ThrowByName(env, "java/util/zip/DataFormatException", msg)
90ce3da70b43 Initial load
duke
parents:
diff changeset
    44
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
    45
static jfieldID inputConsumedID;
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
    46
static jfieldID outputConsumedID;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    47
90ce3da70b43 Initial load
duke
parents:
diff changeset
    48
JNIEXPORT void JNICALL
90ce3da70b43 Initial load
duke
parents:
diff changeset
    49
Java_java_util_zip_Inflater_initIDs(JNIEnv *env, jclass cls)
90ce3da70b43 Initial load
duke
parents:
diff changeset
    50
{
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
    51
    inputConsumedID = (*env)->GetFieldID(env, cls, "inputConsumed", "I");
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
    52
    outputConsumedID = (*env)->GetFieldID(env, cls, "outputConsumed", "I");
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
    53
    CHECK_NULL(inputConsumedID);
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
    54
    CHECK_NULL(outputConsumedID);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    55
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
    56
90ce3da70b43 Initial load
duke
parents:
diff changeset
    57
JNIEXPORT jlong JNICALL
90ce3da70b43 Initial load
duke
parents:
diff changeset
    58
Java_java_util_zip_Inflater_init(JNIEnv *env, jclass cls, jboolean nowrap)
90ce3da70b43 Initial load
duke
parents:
diff changeset
    59
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
    60
    z_stream *strm = calloc(1, sizeof(z_stream));
90ce3da70b43 Initial load
duke
parents:
diff changeset
    61
16059
f0a29ee25e5b 8008759: Do not let internal JDK zlib symbols leak out of fastdebug libzip.so
martin
parents: 14342
diff changeset
    62
    if (strm == NULL) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    63
        JNU_ThrowOutOfMemoryError(env, 0);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    64
        return jlong_zero;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    65
    } else {
16059
f0a29ee25e5b 8008759: Do not let internal JDK zlib symbols leak out of fastdebug libzip.so
martin
parents: 14342
diff changeset
    66
        const char *msg;
f0a29ee25e5b 8008759: Do not let internal JDK zlib symbols leak out of fastdebug libzip.so
martin
parents: 14342
diff changeset
    67
        int ret = inflateInit2(strm, nowrap ? -MAX_WBITS : MAX_WBITS);
f0a29ee25e5b 8008759: Do not let internal JDK zlib symbols leak out of fastdebug libzip.so
martin
parents: 14342
diff changeset
    68
        switch (ret) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    69
          case Z_OK:
90ce3da70b43 Initial load
duke
parents:
diff changeset
    70
            return ptr_to_jlong(strm);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    71
          case Z_MEM_ERROR:
90ce3da70b43 Initial load
duke
parents:
diff changeset
    72
            free(strm);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    73
            JNU_ThrowOutOfMemoryError(env, 0);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    74
            return jlong_zero;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    75
          default:
16059
f0a29ee25e5b 8008759: Do not let internal JDK zlib symbols leak out of fastdebug libzip.so
martin
parents: 14342
diff changeset
    76
            msg = ((strm->msg != NULL) ? strm->msg :
f0a29ee25e5b 8008759: Do not let internal JDK zlib symbols leak out of fastdebug libzip.so
martin
parents: 14342
diff changeset
    77
                   (ret == Z_VERSION_ERROR) ?
f0a29ee25e5b 8008759: Do not let internal JDK zlib symbols leak out of fastdebug libzip.so
martin
parents: 14342
diff changeset
    78
                   "zlib returned Z_VERSION_ERROR: "
f0a29ee25e5b 8008759: Do not let internal JDK zlib symbols leak out of fastdebug libzip.so
martin
parents: 14342
diff changeset
    79
                   "compile time and runtime zlib implementations differ" :
f0a29ee25e5b 8008759: Do not let internal JDK zlib symbols leak out of fastdebug libzip.so
martin
parents: 14342
diff changeset
    80
                   (ret == Z_STREAM_ERROR) ?
f0a29ee25e5b 8008759: Do not let internal JDK zlib symbols leak out of fastdebug libzip.so
martin
parents: 14342
diff changeset
    81
                   "inflateInit2 returned Z_STREAM_ERROR" :
f0a29ee25e5b 8008759: Do not let internal JDK zlib symbols leak out of fastdebug libzip.so
martin
parents: 14342
diff changeset
    82
                   "unknown error initializing zlib library");
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    83
            free(strm);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    84
            JNU_ThrowInternalError(env, msg);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    85
            return jlong_zero;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    86
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    87
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    88
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
    89
55331
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
    90
static void checkSetDictionaryResult(JNIEnv *env, jlong addr, int res)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    91
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
    92
    switch (res) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    93
    case Z_OK:
90ce3da70b43 Initial load
duke
parents:
diff changeset
    94
        break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    95
    case Z_STREAM_ERROR:
90ce3da70b43 Initial load
duke
parents:
diff changeset
    96
    case Z_DATA_ERROR:
5173
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
    97
        JNU_ThrowIllegalArgumentException(env, ((z_stream *)jlong_to_ptr(addr))->msg);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    98
        break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    99
    default:
5173
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   100
        JNU_ThrowInternalError(env, ((z_stream *)jlong_to_ptr(addr))->msg);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   101
        break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   102
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   103
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   104
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   105
JNIEXPORT void JNICALL
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   106
Java_java_util_zip_Inflater_setDictionary(JNIEnv *env, jclass cls, jlong addr,
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   107
                                          jbyteArray b, jint off, jint len)
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   108
{
55331
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   109
    jint res;
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   110
    Bytef *buf = (*env)->GetPrimitiveArrayCritical(env, b, 0);
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   111
    if (buf == NULL) /* out of memory */
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   112
        return;
55331
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   113
    res = inflateSetDictionary(jlong_to_ptr(addr), buf + off, len);
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   114
    (*env)->ReleasePrimitiveArrayCritical(env, b, buf, 0);
55331
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   115
    checkSetDictionaryResult(env, addr, res);
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   116
}
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   117
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   118
JNIEXPORT void JNICALL
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   119
Java_java_util_zip_Inflater_setDictionaryBuffer(JNIEnv *env, jclass cls, jlong addr,
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   120
                                          jlong bufferAddr, jint len)
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   121
{
55331
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   122
    jint res;
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   123
    Bytef *buf = jlong_to_ptr(bufferAddr);
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   124
    res = inflateSetDictionary(jlong_to_ptr(addr), buf, len);
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   125
    checkSetDictionaryResult(env, addr, res);
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   126
}
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   127
55331
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   128
static jint doInflate(jlong addr,
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   129
                       jbyte *input, jint inputLen,
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   130
                       jbyte *output, jint outputLen)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   131
{
55331
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   132
    jint ret;
5173
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   133
    z_stream *strm = jlong_to_ptr(addr);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   134
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   135
    strm->next_in  = (Bytef *) input;
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   136
    strm->next_out = (Bytef *) output;
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   137
    strm->avail_in  = inputLen;
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   138
    strm->avail_out = outputLen;
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   139
5173
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   140
    ret = inflate(strm, Z_PARTIAL_FLUSH);
55331
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   141
    return ret;
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   142
}
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   143
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   144
static jlong checkInflateStatus(JNIEnv *env, jobject this, jlong addr,
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   145
                        jint inputLen, jint outputLen, jint ret )
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   146
{
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   147
    z_stream *strm = jlong_to_ptr(addr);
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   148
    jint inputUsed = 0, outputUsed = 0;
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   149
    int finished = 0;
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   150
    int needDict = 0;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   151
5173
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   152
    switch (ret) {
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   153
    case Z_STREAM_END:
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   154
        finished = 1;
5173
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   155
        /* fall through */
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   156
    case Z_OK:
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   157
        inputUsed = inputLen - strm->avail_in;
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   158
        outputUsed = outputLen - strm->avail_out;
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   159
        break;
5173
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   160
    case Z_NEED_DICT:
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   161
        needDict = 1;
5173
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   162
        /* Might have consumed some input here! */
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   163
        inputUsed = inputLen - strm->avail_in;
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   164
        /* zlib is unclear about whether output may be produced */
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   165
        outputUsed = outputLen - strm->avail_out;
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   166
        break;
5173
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   167
    case Z_BUF_ERROR:
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   168
        break;
5173
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   169
    case Z_DATA_ERROR:
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   170
        inputUsed = inputLen - strm->avail_in;
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   171
        (*env)->SetIntField(env, this, inputConsumedID, inputUsed);
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   172
        outputUsed = outputLen - strm->avail_out;
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   173
        (*env)->SetIntField(env, this, outputConsumedID, outputUsed);
5173
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   174
        ThrowDataFormatException(env, strm->msg);
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   175
        break;
5173
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   176
    case Z_MEM_ERROR:
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   177
        JNU_ThrowOutOfMemoryError(env, 0);
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   178
        break;
5173
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   179
    default:
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   180
        JNU_ThrowInternalError(env, strm->msg);
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   181
        break;
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   182
    }
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   183
    return ((jlong)inputUsed) | (((jlong)outputUsed) << 31) | (((jlong)finished) << 62) | (((jlong)needDict) << 63);
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   184
}
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   185
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   186
JNIEXPORT jlong JNICALL
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   187
Java_java_util_zip_Inflater_inflateBytesBytes(JNIEnv *env, jobject this, jlong addr,
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   188
                                         jbyteArray inputArray, jint inputOff, jint inputLen,
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   189
                                         jbyteArray outputArray, jint outputOff, jint outputLen)
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   190
{
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   191
    jbyte *input = (*env)->GetPrimitiveArrayCritical(env, inputArray, 0);
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   192
    jbyte *output;
55331
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   193
    jint ret;
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   194
    jlong retVal;
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   195
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   196
    if (input == NULL) {
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   197
        if (inputLen != 0 && (*env)->ExceptionOccurred(env) == NULL)
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   198
            JNU_ThrowOutOfMemoryError(env, 0);
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   199
        return 0L;
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   200
    }
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   201
    output = (*env)->GetPrimitiveArrayCritical(env, outputArray, 0);
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   202
    if (output == NULL) {
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   203
        (*env)->ReleasePrimitiveArrayCritical(env, inputArray, input, 0);
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   204
        if (outputLen != 0 && (*env)->ExceptionOccurred(env) == NULL)
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   205
            JNU_ThrowOutOfMemoryError(env, 0);
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   206
        return 0L;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   207
    }
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   208
55331
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   209
    ret = doInflate(addr, input + inputOff, inputLen, output + outputOff,
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   210
                    outputLen);
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   211
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   212
    (*env)->ReleasePrimitiveArrayCritical(env, outputArray, output, 0);
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   213
    (*env)->ReleasePrimitiveArrayCritical(env, inputArray, input, 0);
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   214
55331
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   215
    retVal = checkInflateStatus(env, this, addr, inputLen, outputLen, ret );
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   216
    return retVal;
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   217
}
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   218
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   219
JNIEXPORT jlong JNICALL
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   220
Java_java_util_zip_Inflater_inflateBytesBuffer(JNIEnv *env, jobject this, jlong addr,
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   221
                                         jbyteArray inputArray, jint inputOff, jint inputLen,
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   222
                                         jlong outputBuffer, jint outputLen)
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   223
{
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   224
    jbyte *input = (*env)->GetPrimitiveArrayCritical(env, inputArray, 0);
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   225
    jbyte *output;
55331
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   226
    jint ret;
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   227
    jlong retVal;
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   228
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   229
    if (input == NULL) {
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   230
        if (inputLen != 0 && (*env)->ExceptionOccurred(env) == NULL)
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   231
            JNU_ThrowOutOfMemoryError(env, 0);
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   232
        return 0L;
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   233
    }
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   234
    output = jlong_to_ptr(outputBuffer);
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   235
55331
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   236
    ret = doInflate(addr, input + inputOff, inputLen, output, outputLen);
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   237
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   238
    (*env)->ReleasePrimitiveArrayCritical(env, inputArray, input, 0);
55331
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   239
    retVal = checkInflateStatus(env, this, addr, inputLen, outputLen, ret );
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   240
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   241
    return retVal;
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   242
}
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   243
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   244
JNIEXPORT jlong JNICALL
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   245
Java_java_util_zip_Inflater_inflateBufferBytes(JNIEnv *env, jobject this, jlong addr,
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   246
                                         jlong inputBuffer, jint inputLen,
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   247
                                         jbyteArray outputArray, jint outputOff, jint outputLen)
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   248
{
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   249
    jbyte *input = jlong_to_ptr(inputBuffer);
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   250
    jbyte *output = (*env)->GetPrimitiveArrayCritical(env, outputArray, 0);
55331
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   251
    jint ret;
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   252
    jlong retVal;
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   253
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   254
    if (output == NULL) {
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   255
        if (outputLen != 0 && (*env)->ExceptionOccurred(env) == NULL)
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   256
            JNU_ThrowOutOfMemoryError(env, 0);
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   257
        return 0L;
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   258
    }
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   259
55331
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   260
    ret = doInflate(addr, input, inputLen, output  + outputOff, outputLen);
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   261
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   262
    (*env)->ReleasePrimitiveArrayCritical(env, outputArray, output, 0);
55331
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   263
    retVal = checkInflateStatus(env, this, addr, inputLen, outputLen, ret );
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   264
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   265
    return retVal;
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   266
}
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   267
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   268
JNIEXPORT jlong JNICALL
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   269
Java_java_util_zip_Inflater_inflateBufferBuffer(JNIEnv *env, jobject this, jlong addr,
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   270
                                         jlong inputBuffer, jint inputLen,
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   271
                                         jlong outputBuffer, jint outputLen)
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   272
{
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   273
    jbyte *input = jlong_to_ptr(inputBuffer);
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   274
    jbyte *output = jlong_to_ptr(outputBuffer);
55331
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   275
    jint ret;
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   276
    jlong retVal;
49834
99644c75eaed 6341887: java.util.zip: Add ByteBuffer methods to Inflater/Deflater
sherman
parents: 47216
diff changeset
   277
55331
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   278
    ret = doInflate(addr, input, inputLen, output, outputLen);
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   279
    retVal = checkInflateStatus(env, this, addr, inputLen, outputLen, ret);
dbf5cda9843d 8225189: Multiple JNI calls within critical region in ZIP Library
lancea
parents: 49834
diff changeset
   280
    return retVal;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   281
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   282
90ce3da70b43 Initial load
duke
parents:
diff changeset
   283
JNIEXPORT jint JNICALL
5173
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   284
Java_java_util_zip_Inflater_getAdler(JNIEnv *env, jclass cls, jlong addr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   285
{
5173
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   286
    return ((z_stream *)jlong_to_ptr(addr))->adler;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   287
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   288
90ce3da70b43 Initial load
duke
parents:
diff changeset
   289
JNIEXPORT void JNICALL
5173
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   290
Java_java_util_zip_Inflater_reset(JNIEnv *env, jclass cls, jlong addr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   291
{
5173
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   292
    if (inflateReset(jlong_to_ptr(addr)) != Z_OK) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   293
        JNU_ThrowInternalError(env, 0);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   294
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   295
}
90ce3da70b43 Initial load
duke
parents:
diff changeset
   296
90ce3da70b43 Initial load
duke
parents:
diff changeset
   297
JNIEXPORT void JNICALL
5173
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   298
Java_java_util_zip_Inflater_end(JNIEnv *env, jclass cls, jlong addr)
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   299
{
5173
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   300
    if (inflateEnd(jlong_to_ptr(addr)) == Z_STREAM_ERROR) {
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   301
        JNU_ThrowInternalError(env, 0);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   302
    } else {
5173
36ad2c5fbb51 6745393: Inflater/Deflater clone issue
sherman
parents: 2915
diff changeset
   303
        free(jlong_to_ptr(addr));
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   304
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   305
}