Skip to content
Permalink
Browse files
8265496: improve null check in DeflaterOutputStream/InflaterInputStream
Reviewed-by: lancea, naoto
  • Loading branch information
Hamlin Li committed Apr 27, 2021
1 parent 1d37b98 commit 15d4787724ad8723d36e771a9709db51933df2c1
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 2021, 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
@@ -74,7 +74,7 @@ private void ensureOpen() throws IOException {
* @throws NullPointerException if {@code in} is null
*/
public DeflaterInputStream(InputStream in) {
this(in, new Deflater());
this(in, in != null ? new Deflater() : null);
usesDefaultDeflater = true;
}

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2021, 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
@@ -158,7 +158,7 @@ public DeflaterOutputStream(OutputStream out, Deflater def) {
* @since 1.7
*/
public DeflaterOutputStream(OutputStream out, boolean syncFlush) {
this(out, new Deflater(), 512, syncFlush);
this(out, out != null ? new Deflater() : null, 512, syncFlush);
usesDefaultDeflater = true;
}

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2021, 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
@@ -74,7 +74,7 @@ private void ensureOpen() throws IOException {
* @throws IllegalArgumentException if {@code size <= 0}
*/
public GZIPInputStream(InputStream in, int size) throws IOException {
super(in, new Inflater(true), size);
super(in, in != null ? new Inflater(true) : null, size);
usesDefaultInflater = true;
readHeader(in);
}
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2021, 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
@@ -90,7 +90,7 @@ public GZIPOutputStream(OutputStream out, int size) throws IOException {
public GZIPOutputStream(OutputStream out, int size, boolean syncFlush)
throws IOException
{
super(out, new Deflater(Deflater.DEFAULT_COMPRESSION, true),
super(out, out != null ? new Deflater(Deflater.DEFAULT_COMPRESSION, true) : null,
size,
syncFlush);
usesDefaultDeflater = true;
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2021, 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
@@ -105,7 +105,7 @@ public InflaterInputStream(InputStream in, Inflater inf) {
* @param in the input stream
*/
public InflaterInputStream(InputStream in) {
this(in, new Inflater());
this(in, in != null ? new Inflater() : null);
usesDefaultInflater = true;
}

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 2021, 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
@@ -74,7 +74,7 @@ private void ensureOpen() throws IOException {
* @throws NullPointerException if {@code out} is null
*/
public InflaterOutputStream(OutputStream out) {
this(out, new Inflater());
this(out, out != null ? new Inflater() : null);
usesDefaultInflater = true;
}

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2021, 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
@@ -130,7 +130,7 @@ public ZipOutputStream(OutputStream out) {
* @since 1.7
*/
public ZipOutputStream(OutputStream out, Charset charset) {
super(out, new Deflater(Deflater.DEFAULT_COMPRESSION, true));
super(out, out != null ? new Deflater(Deflater.DEFAULT_COMPRESSION, true) : null);
if (charset == null)
throw new NullPointerException("charset is null");
this.zc = ZipCoder.get(charset);
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Red Hat Inc. All rights reserved.
* Copyright (c) 2020, 2021, Red Hat Inc. 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

1 comment on commit 15d4787

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on 15d4787 Apr 27, 2021

Please sign in to comment.