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 re...@apache.org on 2017/05/09 14:43:41 UTC
svn commit: r1794590 - in /jackrabbit/oak/branches/1.6: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/UtilsTest.java
Author: reschke
Date: Tue May 9 14:43:41 2017
New Revision: 1794590
URL: http://svn.apache.org/viewvc?rev=1794590&view=rev
Log:
OAK-5993: Utils.isIdFromLongPath() may throw StringIndexOutOfBoundsException (ported to 1.6)
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/UtilsTest.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 9 14:43:41 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785919,1785946,1787074,1787217,1788378,1788387-1788389,1790382,1792463,1792742,1792746,1793088,1793618,1793627,1793644
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785919,1785946,1787074,1787217,1788378,1788387-1788389,1789056,1790382,1792463,1792742,1792746,1793088,1793618,1793627,1793644
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java?rev=1794590&r1=1794589&r2=1794590&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java (original)
+++ jackrabbit/oak/branches/1.6/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java Tue May 9 14:43:41 2017
@@ -307,7 +307,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/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/UtilsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/UtilsTest.java?rev=1794590&r1=1794589&r2=1794590&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/UtilsTest.java (original)
+++ jackrabbit/oak/branches/1.6/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/UtilsTest.java Tue May 9 14:43:41 2017
@@ -26,6 +26,7 @@ import org.apache.jackrabbit.oak.api.Com
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
+import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
import org.apache.jackrabbit.oak.plugins.document.Revision;
import org.apache.jackrabbit.oak.plugins.document.RevisionVector;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
@@ -250,4 +251,18 @@ public class UtilsTest {
public void getDepthFromIdIllegalArgumentException2() {
Utils.getDepthFromId("42");
}
+
+ @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(":"));
+ }
}