archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8218280: LineNumberReader throws "Mark invalid" exception if CRLF straddles buffer

Browse source 
Reviewed-by: dfuchs, prappo
This commit is contained in:
Brian Burkhalter 2019-04-29 07:39:16 -07:00
parent fde854e037
commit daa6cc9267
2 changed files with 105 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/java.base/share/classes/java/io/LineNumberReader.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2019, 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
@ -261,6 +261,11 @@ public class LineNumberReader extends BufferedReader {
*/
public void mark(int readAheadLimit) throws IOException {
synchronized (lock) {
// If the most recently read character is '\r', then increment the
// read ahead limit as in this case if the next character is '\n',
// two characters would actually be read by the next read().
if (skipLF)
readAheadLimit++;
super.mark(readAheadLimit);
markedLineNumber = lineNumber;
markedSkipLF = skipLF;