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,65 @@
/*
* Copyright (c) 1998, 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 4149941
@summary mark and reset should throw an exception even when the
underlying stream supports the operations.
*/
import java.io.*;
public class MarkReset {
public static void main(String args[]) throws Exception {
CharArrayReader car = new CharArrayReader(new char[32]);
PushbackReader pb = new PushbackReader(car);
boolean markResult = testMark(pb);
boolean resetResult = testReset(pb);
if ((!markResult) || (!resetResult))
throw new Exception("Mark and reset should not be supported");
}
static boolean testMark(PushbackReader pb){
try{
pb.mark(100);
} catch (IOException e) {
return true; // Passed the test successfully
}
System.err.println("Mark error");
return false; // Failed
}
static boolean testReset(PushbackReader pb){
try{
pb.reset();
} catch (IOException e) {
return true; // Passed the test successfully
}
System.err.println("Reset error");
return false; // Failed
}
}

View file

@ -0,0 +1,115 @@
/*
* Copyright (c) 2015, 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 8143394
* @summary Check for NullPointerException in race between read() and close().
*/
import java.io.CharArrayReader;
import java.io.IOException;
import java.io.PushbackReader;
import java.io.Reader;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Supplier;
public class ReadCloseRaceNPE {
private static final int BUF_SIZE = 1000;
private static final long TIMEOUT_MS = 3000;
private static final List<Exception> failures = new ArrayList<>();
private static void testReader(final Supplier<Reader> readerSupplier)
throws InterruptedException {
AtomicReference<Reader> readerRef =
new AtomicReference<>(readerSupplier.get());
AtomicBoolean isFinished = new AtomicBoolean();
Runnable readTask = () -> {
long startTime = System.currentTimeMillis();
while (System.currentTimeMillis() - startTime < TIMEOUT_MS) {
try {
readerRef.get().read();
} catch (Exception e) {
if (!(e instanceof IOException)) {
failures.add(e);
break;
}
readerRef.set(readerSupplier.get());
}
}
isFinished.set(true);
};
Runnable closeTask = () -> {
while (!isFinished.get()) {
try {
readerRef.get().close();
} catch (Exception e) {
if (!(e instanceof IOException)) {
e.printStackTrace();
}
}
}
};
Thread readThread = new Thread(readTask);
Thread closeThread = new Thread(closeTask);
readThread.start();
closeThread.start();
readThread.join();
closeThread.join();
}
public static void main(String[] args) throws Throwable {
final String s = "Two riders were approaching.\\n";
Supplier<Reader> charPushbackReaderSupplier = () -> {
char buf[] = new char[s.length()];
s.getChars(0, s.length(), buf, 0);
CharArrayReader in = new CharArrayReader(buf);
return new PushbackReader(in, BUF_SIZE);
};
testReader(charPushbackReaderSupplier);
Supplier<Reader> stringPushbackReaderSupplier = () -> {
StringReader in = new StringReader(s);
return new PushbackReader(in, BUF_SIZE);
};
testReader(stringPushbackReaderSupplier);
if (!failures.isEmpty()) {
failures.stream().forEach((x) -> ((Exception) x).printStackTrace());
throw new RuntimeException("PushbackReaderNPE failed");
}
}
}

View file

@ -0,0 +1,69 @@
/*
* Copyright (c) 2002, 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 4398210
* @summary check skip method after pushing data back
*
*/
import java.io.*;
public class Skip {
public static void main(String args[]) throws Exception {
test1();
}
private static void test1() throws Exception {
char[] buf = new char[20];
for (int i=0; i<20; i++)
buf[i] = (char)i;
CharArrayReader car = new CharArrayReader(buf);
PushbackReader pr = new PushbackReader(car, 10);
check(pr.read(), 0);
// Check skip without unread chars present
pr.skip(1);
check(pr.read(), 2);
pr.unread(2);
pr.unread(1);
// Check skip over and beyond unread chars
pr.skip(4);
check(pr.read(), 5);
check(pr.read(), 6);
pr.unread(6);
pr.unread(5);
// Check skip within unread chars
pr.skip(1);
check(pr.read(), 6);
check(pr.read(), 7);
// Check skip after unread chars have been used
pr.skip(3);
check(pr.read(), 11);
}
private static void check (int i, int j) {
if (i != j)
throw new RuntimeException("Test failed");
}
}