undefect. CWE-407 — 63 sites patched across 27 ecosystems

Authors: russell@unturf.com · brackishbert@gmail.com · foxhop.net · TimeHexOn.com

Patches, unit tests, benchmarks, whitepaper, and outreach briefs.
Public domain — no copyright claimed. Use freely.
This commit is contained in:
russell@unturf.com 2026-03-26 17:11:57 -04:00
commit 0a580b313d
70422 changed files with 17213626 additions and 0 deletions

View file

@ -0,0 +1,59 @@
/*
* Copyright (c) 2003, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/* @test
* @bug 4812237
* @summary Make sure that the mark() and reset() methods behave as expected.
*/
import java.io.*;
import java.util.zip.*;
public class MarkReset {
public static void main(String args[]) throws Exception {
test1();
}
private static void test1() throws Exception {
boolean expOccurred = false;
byte data[] = {90, 91, 92, 93, 94, 95, 96, 97};
InflaterInputStream in =
new InflaterInputStream(new ByteArrayInputStream(data));
in.mark(-5);
in.mark(6);
in.mark(Integer.MAX_VALUE);
try {
in.reset();
throw new RuntimeException("Expected exception not thrown");
} catch (IOException e) {
// Correct result
}
try {
in.reset();
throw new RuntimeException("Expected exception not thrown");
} catch (IOException e) {
// Correct result
}
}
}

View file

@ -0,0 +1,93 @@
/*
* Copyright (c) 2016, 2017, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/* @test
* @library /test/lib
* @build jdk.test.lib.RandomFactory
* @run main TestAvailable
* @bug 7031075 8161426
* @summary Make sure that available() method behaves as expected.
* @key randomness
*/
import java.io.*;
import java.util.Random;
import java.util.zip.*;
import jdk.test.lib.RandomFactory;
public class TestAvailable {
public static void main(String args[]) throws Throwable {
Random r = RandomFactory.getRandom();
for (int n = 0; n < 10; n++) {
byte[] src = new byte[r.nextInt(100) + 1];
r.nextBytes(src);
// test InflaterInputStream
ByteArrayOutputStream baos = new ByteArrayOutputStream();
try (DeflaterOutputStream dos = new DeflaterOutputStream(baos)) {
dos.write(src);
}
try (InflaterInputStream iis = new InflaterInputStream(
new ByteArrayInputStream(baos.toByteArray()))) {
test(iis, src);
}
// test GZIPInputStream
baos = new ByteArrayOutputStream();
try (GZIPOutputStream dos = new GZIPOutputStream(baos)) {
dos.write(src);
}
try (GZIPInputStream gis = new GZIPInputStream(
new ByteArrayInputStream(baos.toByteArray()))) {
test(gis, src);
}
}
}
private static void test(InputStream is, byte[] expected) throws IOException {
int cnt = 0;
do {
int available = is.available();
if (available > 0) {
int b = is.read();
if (b == -1) {
throw new RuntimeException("available() > 0, read() == -1 : failed!");
}
if (expected[cnt++] != (byte)b) {
throw new RuntimeException("read() : failed!");
}
} else if (available == 0) {
if (is.read() != -1) {
throw new RuntimeException("available() == 0, read() != -1 : failed!");
}
break;
} else {
throw new RuntimeException("available() < 0 : failed!");
}
} while (true);
if (cnt != expected.length) {
throw new RuntimeException("read : failed!");
}
}
}

View file

@ -0,0 +1,77 @@
/*
* Copyright (c) 2022, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* @test
* @bug 8292327
* @summary Test the case where Inflater.needsInput() is true but the native
* inflater still has unwritten output in its internal buffer.
*/
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.zip.Deflater;
import java.util.zip.DeflaterInputStream;
import java.util.zip.Inflater;
import java.util.zip.InflaterInputStream;
public class UnexpectedEndOfZlibStream {
public static void main(String[] args) throws Exception {
String original = "Readsuncompresseddataintoanarrayofbytes0123456789Ifcodelenis" +
"notzerothemethodwillblockReadsuncompresseddataintoanarrayofbytes123456789";
byte[] deflated =
new DeflaterInputStream(
new ByteArrayInputStream(original.getBytes("US-ASCII")),
new Deflater(Deflater.DEFAULT_COMPRESSION, /*nowrap=*/ true)
).readAllBytes();
// using readAllBytes succeeds, the underlying gzip data seems to be well-formed
byte[] inflated =
new InflaterInputStream(
new ByteArrayInputStream(deflated),
new Inflater(/*nowrap=*/ true)
).readAllBytes();
if (!original.equals(new String(inflated, "US-ASCII"))) {
throw new Exception("Inflated output differs from original");
}
// a 128 byte read followed by a 512 byte read fails after JDK-8281962
InflaterInputStream is =
new InflaterInputStream(
new ByteArrayInputStream(deflated),
new Inflater(/*nowrap=*/ true));
byte[] buf = new byte[512];
int n = is.read(buf, 0, 128);
int pos = n;
while (n > 0) {
if ((n = is.read(buf, pos, 1)) > 0) { // Unexpected end of ZLIB input stream
pos+= n;
}
}
if (!original.equals(new String(buf, 0, pos, "US-ASCII"))) {
throw new Exception("Inflated output differs from original");
}
}
}