aboutsummaryrefslogtreecommitdiffstats
path: root/vespajlib/src/main/java/com/yahoo/text/Text.java
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-09-18 23:06:36 +0200
committerGitHub <noreply@github.com>2023-09-18 23:06:36 +0200
commitea761a84ccacf2ffa85cc85e8cdc6d9212330a84 (patch)
tree9d6c13062018078c06c1e9fd00aa6f9f0e847ea2 /vespajlib/src/main/java/com/yahoo/text/Text.java
parenteede788d1c20d2f246f44287308dad69487369ea (diff)
parent7dd967768e90abfbcced81148cd3bb9d17bc8b23 (diff)
Merge pull request #28567 from vespa-engine/balder/catch-when-from-is-within-codepoints-and-lengthv8.229.1
Handle the exception that will come when codepoints < 'from' < len. MERGEOK
Diffstat (limited to 'vespajlib/src/main/java/com/yahoo/text/Text.java')
-rw-r--r--vespajlib/src/main/java/com/yahoo/text/Text.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/text/Text.java b/vespajlib/src/main/java/com/yahoo/text/Text.java
index 2f0051d4795..a2e7a696857 100644
--- a/vespajlib/src/main/java/com/yahoo/text/Text.java
+++ b/vespajlib/src/main/java/com/yahoo/text/Text.java
@@ -186,7 +186,12 @@ public final class Text {
int len = s.length();
if ((fromCP >= len) || (fromCP >= toCP)) return "";
- int from = s.offsetByCodePoints(0, fromCP);
+ int from;
+ try {
+ from = s.offsetByCodePoints(0, fromCP);
+ } catch (IndexOutOfBoundsException e) {
+ return "";
+ }
if (from >= len) return "";
int lenCP = toCP - fromCP;
if (from + lenCP >= len) return s.substring(from);