You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2017/03/28 07:11:40 UTC
svn commit: r1789056 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
test/java/org/apache/jackrabbit/oak/plugins/document/util/UtilsTest.java
Author: mreutegg
Date: Tue Mar 28 07:11:40 2017
New Revision: 1789056
URL: http://svn.apache.org/viewvc?rev=1789056&view=rev
Log:
OAK-5993: Utils.isIdFromLongPath() may throw StringIndexOutOfBoundsException
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/UtilsTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java?rev=1789056&r1=1789055&r2=1789056&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java Tue Mar 28 07:11:40 2017
@@ -309,7 +309,7 @@ public class Utils {
public static boolean isIdFromLongPath(String id) {
int index = id.indexOf(':');
- return id.charAt(index + 1) == 'h';
+ return index != -1 && index < id.length() - 1 && id.charAt(index + 1) == 'h';
}
public static String getPathFromId(String id) {
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/UtilsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/UtilsTest.java?rev=1789056&r1=1789055&r2=1789056&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/UtilsTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/UtilsTest.java Tue Mar 28 07:11:40 2017
@@ -284,4 +284,18 @@ public class UtilsTest {
Utils.alignWithExternalRevisions(doc, c, 1);
assertThat(c.getTime(), is(greaterThan(lastRev2.getTimestamp())));
}
+
+ @Test
+ public void isIdFromLongPath() {
+ String path = "/test";
+ while (!Utils.isLongPath(path)) {
+ path += path;
+ }
+ String idFromLongPath = Utils.getIdFromPath(path);
+ assertTrue(Utils.isIdFromLongPath(idFromLongPath));
+ assertFalse(Utils.isIdFromLongPath("foo"));
+ assertFalse(Utils.isIdFromLongPath(NodeDocument.MIN_ID_VALUE));
+ assertFalse(Utils.isIdFromLongPath(NodeDocument.MAX_ID_VALUE));
+ assertFalse(Utils.isIdFromLongPath(":"));
+ }
}