Merge pull request JuliaLang#26549 from bkamins/patch-18

Fix nextind out of bounds error
tekverkp · Mar 28, 2018 · 8ec16ea · 8ec16ea
2 parents 40127a6 + 60d4a8f
commit 8ec16ea
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/base/strings/string.jl b/base/strings/string.jl
@@ -136,7 +136,8 @@ function _nextind_str(s, i::Int)
  return i′ < i ? nextind(s, i′) : i+1
  end
  # first continuation byte
- @inbounds b = codeunit(s, i += 1)
+ (i += 1) > n && return i
+ @inbounds b = codeunit(s, i)
  b & 0xc0 ≠ 0x80 && return i
  ((i += 1) > n) | (l < 0xe0) && return i
  # second continuation byte