From: Shawn Pearce <spearce@spearce.org>
Date: Wed, 12 Mar 2014 00:42:01 +0000 (-0700)
Subject: Extract path segment check function in ObjectChecker
X-Git-Tag: v3.4.0.201405051725-m7~51^2~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F25%2F23225%2F2;p=jgit.git

Extract path segment check function in ObjectChecker

Start pulling out the path segment checking. This will be used
later to support DirCacheCheckout verification of paths, after
folding that logic into this location.

Change-Id: I66eaee5c988eb7d425fb7a708ef6f5419ab77348
---

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java
index 14cb528984..6e470c9b2b 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java
@@ -346,15 +346,7 @@ public class ObjectChecker {
 				if (c == '/')
 					throw new CorruptObjectException("name contains '/'");
 			}
-			if (thisNameB + 1 == ptr)
-				throw new CorruptObjectException("zero length name");
-			if (raw[thisNameB] == '.') {
-				final int nameLen = (ptr - 1) - thisNameB;
-				if (nameLen == 1)
-					throw new CorruptObjectException("invalid name '.'");
-				if (nameLen == 2 && raw[thisNameB + 1] == '.')
-					throw new CorruptObjectException("invalid name '..'");
-			}
+			checkPathSegment(raw, thisNameB, ptr - 1);
 			if (duplicateName(raw, thisNameB, ptr - 1))
 				throw new CorruptObjectException("duplicate entry names");
 
@@ -375,6 +367,19 @@ public class ObjectChecker {
 		}
 	}
 
+	private static void checkPathSegment(byte[] raw, int ptr, int end)
+			throws CorruptObjectException {
+		if (ptr == end)
+			throw new CorruptObjectException("zero length name");
+		if (raw[ptr] == '.') {
+			int nameLen = end - ptr;
+			if (nameLen == 1)
+				throw new CorruptObjectException("invalid name '.'");
+			if (nameLen == 2 && raw[ptr + 1] == '.')
+				throw new CorruptObjectException("invalid name '..'");
+		}
+	}
+
 	/**
 	 * Check a blob for errors.
 	 *