Skip to content

Commit 7baf4cc

Browse files
committed
Merge branch '2.13' into 2.14
2 parents 9d8603a + a9520e6 commit 7baf4cc

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

csv/src/main/java/com/fasterxml/jackson/dataformat/csv/impl/CsvEncoder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ public final void write(int columnIndex, int value) throws IOException
405405
if (columnIndex == _nextColumnToWrite) {
406406
// inlined 'appendValue(int)'
407407
// up to 10 digits and possible minus sign, leading comma
408-
if ((_outputTail + 12) > _outputTail) {
408+
if ((_outputTail + 12) > _outputEnd) {
409409
_flushBuffer();
410410
}
411411
if (_nextColumnToWrite > 0) {
@@ -424,7 +424,7 @@ public final void write(int columnIndex, long value) throws IOException
424424
if (columnIndex == _nextColumnToWrite) {
425425
// inlined 'appendValue(int)'
426426
// up to 20 digits, minus sign, leading comma
427-
if ((_outputTail + 22) > _outputTail) {
427+
if ((_outputTail + 22) > _outputEnd) {
428428
_flushBuffer();
429429
}
430430
if (_nextColumnToWrite > 0) {

release-notes/VERSION-2.x

+5
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ Active Maintainers:
3333
(contributed by @pjfanning)
3434
* (yaml) Fixes to number decoding based on oss-fuzz findings
3535

36+
2.13.5 (not yet released)
37+
38+
#343: Incorrect output buffer boundary check in `CsvEncoder`
39+
(reported by k163377@github)
40+
3641
2.13.4 (03-Sep-2022)
3742

3843
#329: (yaml) Update to SnakeYAML 1.31

0 commit comments

Comments
 (0)