diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2012-12-02 19:14:02 +0100 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2012-12-02 19:17:58 +0100 |
commit | 7ee1145d4502396816da3fb0155960524de94079 (patch) | |
tree | a876c04cc2466b561e8146aac6dff1e127688573 /src | |
parent | f16f4ab157293ac6860d4b00578b983c90b8fc62 (diff) | |
download | scala-7ee1145d4502396816da3fb0155960524de94079.tar.gz scala-7ee1145d4502396816da3fb0155960524de94079.tar.bz2 scala-7ee1145d4502396816da3fb0155960524de94079.zip |
SI-6631 Handle invalid escapes in string interpolators
Patch contributed by Rex Kerr.
Diffstat (limited to 'src')
-rw-r--r-- | src/library/scala/StringContext.scala | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/library/scala/StringContext.scala b/src/library/scala/StringContext.scala index 8be0cb1619..756077dd15 100644 --- a/src/library/scala/StringContext.scala +++ b/src/library/scala/StringContext.scala @@ -191,7 +191,7 @@ object StringContext { var cur = 0 var idx = 0 def output(ch: Char) = { - bldr append str.substring (start, cur) + bldr.append(str, start, cur) bldr append ch start = idx } @@ -199,14 +199,15 @@ object StringContext { cur = idx if (str(idx) == '\\') { idx += 1 + if (idx >= len) throw new InvalidEscapeException(str, cur) if ('0' <= str(idx) && str(idx) <= '7') { val leadch = str(idx) var oct = leadch - '0' idx += 1 - if ('0' <= str(idx) && str(idx) <= '7') { + if (idx < len && '0' <= str(idx) && str(idx) <= '7') { oct = oct * 8 + str(idx) - '0' idx += 1 - if (leadch <= '3' && '0' <= str(idx) && str(idx) <= '7') { + if (idx < len && leadch <= '3' && '0' <= str(idx) && str(idx) <= '7') { oct = oct * 8 + str(idx) - '0' idx += 1 } @@ -234,6 +235,6 @@ object StringContext { } } if (start == 0) str - else (bldr append str.substring(start, idx)).toString + else bldr.append(str, start, idx).toString } } |