From 605397be913e15cd6ae50afec781f82dfcec55ae Mon Sep 17 00:00:00 2001 From: Eli Lindsey Date: Sat, 18 Jan 2014 22:47:38 -0800 Subject: [PATCH] LANG-936: Handle Integer.MAX_VALUE edge condition in getLevenshteinDistance(String, String, int) --- src/main/java/org/apache/commons/lang3/StringUtils.java | 2 +- .../java/org/apache/commons/lang3/StringUtilsTest.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java index 2a1c2f843cf..68bb78a2e0e 100644 --- a/src/main/java/org/apache/commons/lang3/StringUtils.java +++ b/src/main/java/org/apache/commons/lang3/StringUtils.java @@ -6938,7 +6938,7 @@ distance is O(nm), but a bound of k allows us to reduce it to O(km) time by only // compute stripe indices, constrain to array size final int min = Math.max(1, j - threshold); - final int max = Math.min(n, j + threshold); + final int max = (j > Integer.MAX_VALUE - threshold) ? n : Math.min(n, j + threshold); // the stripe may lead off of the table if s and t are of different sizes if (min > max) { diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsTest.java index b4fda09ffca..06e70795847 100644 --- a/src/test/java/org/apache/commons/lang3/StringUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/StringUtilsTest.java @@ -1974,6 +1974,14 @@ public void testGetLevenshteinDistance_StringStringInt() { assertEquals(8, StringUtils.getLevenshteinDistance("zzzzzzzz", "hippo",8) ); assertEquals(1, StringUtils.getLevenshteinDistance("hello", "hallo",1) ); + assertEquals(1, StringUtils.getLevenshteinDistance("frog", "fog", Integer.MAX_VALUE) ); + assertEquals(3, StringUtils.getLevenshteinDistance("fly", "ant", Integer.MAX_VALUE) ); + assertEquals(7, StringUtils.getLevenshteinDistance("elephant", "hippo", Integer.MAX_VALUE) ); + assertEquals(7, StringUtils.getLevenshteinDistance("hippo", "elephant", Integer.MAX_VALUE) ); + assertEquals(8, StringUtils.getLevenshteinDistance("hippo", "zzzzzzzz", Integer.MAX_VALUE) ); + assertEquals(8, StringUtils.getLevenshteinDistance("zzzzzzzz", "hippo", Integer.MAX_VALUE) ); + assertEquals(1, StringUtils.getLevenshteinDistance("hello", "hallo", Integer.MAX_VALUE) ); + // exceptions try { @SuppressWarnings("unused")