Skip to content

fix off-by-one out-of-bounds write in EmulatedCharset.getBytes #10326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
metsw24-max wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −1
Open

fix off-by-one out-of-bounds write in EmulatedCharset.getBytes #10326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion user/super/com/google/gwt/emul/javaemul/internal/EmulatedCharset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public byte[] getBytes(char[] buffer, int offset, int count) {
int n = offset + count;
byte[] bytes = new byte[count];
for (int i = offset; i < n; ++i) {
bytes[i] = (byte) (buffer[i] & 255);
bytes[i - offset] = (byte) (buffer[i] & 255);
}
return bytes;
}
Expand Down
8 changes: 8 additions & 0 deletions user/test/com/google/gwt/emultest/java/io/OutputStreamWriterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,14 @@ public void testWriteASCIIChar() throws IOException {
new String(ASCII_CHAR_ARRAY).getBytes(StandardCharsets.UTF_8), baos.toByteArray()));
}

public void testWriteArrayWithOffset() throws IOException {
OutputStreamWriter latin1Writer = new OutputStreamWriter(baos, StandardCharsets.ISO_8859_1);
char[] chars = {'a', 'b', 'c', 'd'};
latin1Writer.write(chars, 1, 2);
latin1Writer.close();
assertTrue(Arrays.equals(new byte[] {'b', 'c'}, baos.toByteArray()));
}

public void testWriteArrayUsingNullArray() throws IOException {
final char[] b = null;
try {
Expand Down
Loading