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,79 @@
/*
* Copyright (c) 2004, 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 5030623
* @summary Basic test of all append() methods in Writer and inherited classes.
*/
import java.io.*;
import java.lang.reflect.*;
public class Append {
// append methods throw IOException
private static Class [] io = {
Writer.class, BufferedWriter.class, FilterWriter.class,
OutputStreamWriter.class, FileWriter.class
};
// append methods don't throw IOException
private static Class [] nio = {
CharArrayWriter.class, StringWriter.class, PrintWriter.class,
PrintStream.class
};
public static void main(String [] args) {
for (int i = 0; i < io.length; i++)
test(io[i], true);
for (int i = 0; i < nio.length; i++)
test(nio[i], false);
}
private static void test(Class c, boolean io) {
try {
Class [] cparams = { char.class };
test(c.getMethod("append", cparams), io);
Class [] csparams = { CharSequence.class };
test(c.getMethod("append", csparams), io);
} catch (NoSuchMethodException x) {
throw new RuntimeException("No append method found");
}
}
private static void test(Method m, boolean io) {
Class [] ca = m.getExceptionTypes();
boolean found = false;
for (int i = 0; i < ca.length; i++) {
if (ca[i].equals(IOException.class)) {
found = true;
break;
}
}
if (found && !io)
throw new RuntimeException("Unexpected IOException");
if (!found && io)
throw new RuntimeException("Missing IOException");
}
}

View file

@ -0,0 +1,156 @@
/*
* 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 6856817
* @summary optimize the Writer.append(CharSequence) method
*/
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
/**
*
* @author vyom.tewari@oacle.com
*/
public class Bug6856817 {
private static final String str = "This is just a test string that i am using it to test the CharBuffer.append(CharSequence csq) for little bit performance improvement.";
private static final int BUF_SIZE = 1024;
/**
*
* @param args
*/
public static void main(String args[]) {
CharBuffer charBuffer = CharBuffer.allocate(BUF_SIZE);
File file = new File("temp.txt");
file.deleteOnExit();
charBuffer.put(str);
charBuffer.flip();
checkFileContent(charBuffer, file, str);
charBuffer.position(10);
checkFileContent(charBuffer, file, str.substring(10));
charBuffer.position(charBuffer.limit());
checkFileContent(charBuffer, file, str.substring(charBuffer.limit()));
char arr[] = new char[BUF_SIZE];
charBuffer = CharBuffer.wrap(arr);
charBuffer.put(str);
charBuffer.flip();
checkFileContent(charBuffer, file, str);
charBuffer.position(10);
checkFileContent(charBuffer, file, str.substring(10));
charBuffer.position(charBuffer.limit());
checkFileContent(charBuffer, file, str.substring(charBuffer.limit()));
char secArr[] = new char[BUF_SIZE];
charBuffer = CharBuffer.wrap(secArr);
charBuffer.put(str);
charBuffer.position(5);
charBuffer.limit(str.length() - 7);
charBuffer = charBuffer.slice();
checkFileContent(charBuffer, file, str.substring(5, (str.length() - 7)));
charBuffer.position(10);
checkFileContent(charBuffer, file, str.substring(15, (str.length() - 7)));
charBuffer.position(charBuffer.limit());
checkFileContent(charBuffer, file, str.substring(charBuffer.limit()));
charBuffer = ByteBuffer.allocate(BUF_SIZE).asCharBuffer();
charBuffer.put(str);
charBuffer.flip();
checkFileContent(charBuffer, file, str);
charBuffer.position(10);
checkFileContent(charBuffer, file, str.substring(10));
charBuffer.position(charBuffer.limit());
checkFileContent(charBuffer, file, str.substring(charBuffer.limit()));
charBuffer = ByteBuffer.allocateDirect(1024).asCharBuffer();
charBuffer.put(str);
charBuffer.flip();
checkFileContent(charBuffer, file, str);
charBuffer.position(10);
checkFileContent(charBuffer, file, str.substring(10));
charBuffer.position(charBuffer.limit());
checkFileContent(charBuffer, file, str.substring(charBuffer.limit()));
}
private static void checkFileContent(CharBuffer charBuffer, File file, String expectedValue) {
OutputStreamWriter writer = null;
FileReader reader = null;
int position, limit;
position = charBuffer.position();
limit = charBuffer.limit();
try {
OutputStream outputStream = new FileOutputStream(file);
writer = new OutputStreamWriter(outputStream);
writer.append(charBuffer);
writer.close();
if (!isEqual(position, charBuffer.position())) {
System.out.println(": failed");
throw new RuntimeException("buffer position before write: " + position + " and position after write: " + charBuffer.position());
}
if (!isEqual(limit, charBuffer.limit())) {
System.out.println(": failed");
throw new RuntimeException("buffer limit before write: " + limit + " and limit after write: " + charBuffer.limit());
}
reader = new FileReader(file);
char arr[] = new char[BUF_SIZE];
int byteRead = reader.read(arr);
if (byteRead != -1) {
String stringRead = new String(arr, 0, byteRead);
if (expectedValue.equals(stringRead)) {
System.out.println(": passed");
} else {
System.out.println(": failed");
throw new RuntimeException("expected :" + expectedValue + " and got:" + stringRead);
}
}
} catch (IOException ex) {
ex.printStackTrace();
throw new RuntimeException(ex);
} finally {
try {
if (writer != null) {
writer.close();
}
if (reader != null) {
reader.close();
}
} catch (IOException ex) {
throw new RuntimeException(ex);
}
}
}
private static boolean isEqual(final int first, final int second) {
return (first == second);
}
}

View file

@ -0,0 +1,166 @@
/*
* Copyright (c) 2018, 2026, 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.
*/
import java.io.IOException;
import java.io.Writer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
/*
* @test
* @bug 8196298
* @run junit NullWriter
* @summary Check for expected behavior of Writer.nullWriter().
*/
public class NullWriter {
private static Writer openWriter;
private static Writer closedWriter;
@BeforeAll
public static void setup() throws IOException {
openWriter = Writer.nullWriter();
closedWriter = Writer.nullWriter();
closedWriter.close();
}
@AfterAll
public static void closeStream() throws IOException {
openWriter.close();
}
@Test
public void testOpen() {
assertNotNull(openWriter, "Writer.nullWriter() returned null");
}
@Test
public void testAppendChar() throws IOException {
assertSame(openWriter, openWriter.append('x'));
}
@Test
public void testAppendCharSequence() throws IOException {
CharSequence cs = "abc";
assertSame(openWriter, openWriter.append(cs));
}
@Test
public void testAppendCharSequenceNull() throws IOException {
assertSame(openWriter, openWriter.append(null));
}
@Test
public void testAppendCharSequenceII() throws IOException {
CharSequence cs = "abc";
assertSame(openWriter, openWriter.append(cs, 0, 1));
}
@Test
public void testAppendCharSequenceIINull() throws IOException {
assertSame(openWriter, openWriter.append(null, 2, 1));
}
@Test
public void testFlush() throws IOException {
openWriter.flush();
}
@Test
public void testWrite() throws IOException {
openWriter.write(62832);
}
@Test
public void testWriteString() throws IOException {
openWriter.write("");
}
@Test
public void testWriteStringII() throws IOException {
openWriter.write("", 0, 0);
}
@Test
public void testWriteBII() throws IOException, Exception {
openWriter.write(new char[]{(char) 6}, 0, 1);
}
@Test
public void testAppendCharClosed() throws IOException {
assertThrows(IOException.class, () -> closedWriter.append('x'));
}
@Test
public void testAppendCharSequenceClosed() throws IOException {
CharSequence cs = "abc";
assertThrows(IOException.class, () -> closedWriter.append(cs));
}
@Test
public void testAppendCharSequenceNullClosed() throws IOException {
assertThrows(IOException.class, () -> closedWriter.append(null));
}
@Test
public void testAppendCharSequenceIIClosed() throws IOException {
CharSequence cs = "abc";
assertThrows(IOException.class, () -> closedWriter.append(cs, 0, 1));
}
@Test
public void testAppendCharSequenceIINullClosed() throws IOException {
assertThrows(IOException.class, () -> closedWriter.append(null, 2, 1));
}
@Test
public void testFlushClosed() throws IOException {
assertThrows(IOException.class, () -> closedWriter.flush());
}
@Test
public void testWriteClosed() throws IOException {
assertThrows(IOException.class, () -> closedWriter.write(62832));
}
@Test
public void testWriteStringClosed() throws IOException {
assertThrows(IOException.class, () -> closedWriter.write(""));
}
@Test
public void testWriteStringIIClosed() throws IOException {
assertThrows(IOException.class, () -> closedWriter.write("", 0, 0));
}
@Test
public void testWriteBIIClosed() throws IOException {
assertThrows(IOException.class,
() -> closedWriter.write(new char[]{(char) 6}, 0, 1));
}
}

View file

@ -0,0 +1,119 @@
/*
* 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 4071765
@summary Bug in the parameter of str.getChars called in write
*/
import java.io.*;
public class WriteFromString {
public static void main(String argv[]) throws Exception {
LocalStringWriter lsw = new LocalStringWriter();
boolean result = true;
String testString = "Testing of what gets written";
// Should write out at offset 2 for length 4 i.e."stin"
lsw.write(testString, 1, 4);
String res = lsw.toString();
if (!res.equals("esti")) {
result = false;
System.err.println("Writer.write is incorrect:" + res);
}
// Same bug in stringwriter as well
StringWriter sw = new StringWriter();
sw.write(testString, 1, 4);
res = sw.toString();
String ss = testString.substring(1,4);
System.out.println("Substring = "+ss);
if (!res.equals("esti")) {
System.err.println("StringWriter.write is incorrect:" + res);
result = false;
}
if (!result) {
throw new Exception("Writer.write method is incorrect.");
}
}
}
/**
* A copy of StringWriter to test the write method in Writer
*/
class LocalStringWriter extends Writer {
private StringBuffer buf;
/**
* Create a new string writer, using the default initial string-buffer
* size.
*/
public LocalStringWriter() {
buf = new StringBuffer();
lock = buf;
}
/**
* Write a portion of an array of characters.
*
* @param cbuf Array of characters
* @param off Offset from which to start writing characters
* @param len Number of characters to write
*/
public void write(char cbuf[], int off, int len) {
if ((off < 0) || (off > cbuf.length) || (len < 0) ||
((off + len) > cbuf.length) || ((off + len) < 0)) {
throw new IndexOutOfBoundsException();
} else if (len == 0) {
return;
}
buf.append(cbuf, off, len);
}
/**
* Write a string.
*/
public void write(String str) {
buf.append(str);
}
/**
* Return the buffer's current value as a string.
*/
public String toString() {
return buf.toString();
}
public void flush(){ }
public void close(){ }
}

View file

@ -0,0 +1,93 @@
/*
* 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 4127657
* @summary Check for correct handling of parameters to
* XXXXWriter.write(b, off, len).
*
*/
import java.io.*;
public class WriteParams {
static int values[] = {Integer.MIN_VALUE, -1, 0, 1, 4, 16, 31,
32, 33, Integer.MAX_VALUE};
static char b[][] = {null, new char[32]};
static void test(Writer wtr) throws Exception {
int i = 0, j = 0, k = 0;
boolean nullPtr = false, indexOutBnd = false;
for (i = 0; i < b.length; i++) {
for ( j = 0; j < values.length; j++) {
for ( k = 0; k < values.length; k++) {
nullPtr = (b[i] == null);
int bufLen = nullPtr ? 0 : b[i].length;
indexOutBnd = ((values[j] + values[k]) < 0)
|| (values[j] < 0)
|| (values[j] > bufLen)
|| (values[k] < 0)
|| ((values[j] + values[k]) > bufLen);
try {
wtr.write(b[i], values[j], values[k]);
} catch (NullPointerException e) {
if (!nullPtr) {
throw new Exception
("should not throw NullPointerException");
}
continue;
} catch (IndexOutOfBoundsException e) {
if (!indexOutBnd) {
throw new Exception
("should not throw IndexOutOfBoundsException");
}
continue;
}
if (nullPtr || indexOutBnd) {
throw new Exception("Should have thrown an exception");
}
}
}
}
}
public static void main(String args[]) throws Exception{
StringWriter sw = new StringWriter();
test(sw);
test(new BufferedWriter(sw));
test(new CharArrayWriter());
test(new OutputStreamWriter(System.err));
test(new PipedWriter(new PipedReader()));
}
}