summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/compiler/scala/tools/nsc/util/CharArrayReader.scala2
-rw-r--r--test/files/pos/t1937/NumberGenerator.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/util/CharArrayReader.scala b/src/compiler/scala/tools/nsc/util/CharArrayReader.scala
index ac1b37cb48..a6c10520bb 100644
--- a/src/compiler/scala/tools/nsc/util/CharArrayReader.scala
+++ b/src/compiler/scala/tools/nsc/util/CharArrayReader.scala
@@ -75,7 +75,7 @@ class CharArrayReader(buf: RandomAccessSeq[Char], start: Int, /* startline: int,
case '\t' =>
// nextcol = ((nextcol - 1) / tabinc * tabinc) + tabinc + 1;
case CR =>
- if (buf(bp) == LF) {
+ if (bp < buf.size && buf(bp) == LF) {
ch = LF
bp += 1
}
diff --git a/test/files/pos/t1937/NumberGenerator.java b/test/files/pos/t1937/NumberGenerator.java
new file mode 100644
index 0000000000..2f85e87bcc
--- /dev/null
+++ b/test/files/pos/t1937/NumberGenerator.java
@@ -0,0 +1 @@
+package br.com.caelum.caelumweb2.money; public class NumberGenerator { public String generate() { return null; } } \ No newline at end of file