C Git allows a path name to be longer than 4095 bytes by storing 4095
into the path name length field within flags and then searching for a
null terminator at the end of the path name, instead of relying on the
length indicatior. We cannot do this (easily) from an InputStream so
we are currently going to just abort with an exception if we find such
an extremely long path name.
Signed-off-by: Shawn O. Pearce <spearce@xxxxxxxxxxx>
---
.../org/spearce/jgit/dircache/DirCacheEntry.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/org.spearce.jgit/src/org/spearce/jgit/dircache/DirCacheEntry.java b/org.spearce.jgit/src/org/spearce/jgit/dircache/DirCacheEntry.java
index c481e43..bcf5596 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/dircache/DirCacheEntry.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/dircache/DirCacheEntry.java
@@ -81,6 +81,9 @@
private static final int P_FLAGS = 60;
+ /** Mask applied to data in {@link #P_FLAGS} to get the name length. */
+ private static final int NAME_MASK = 0xfff;
+
static final int INFO_LEN = 62;
private static final int ASSUME_VALID = 0x80;
@@ -101,7 +104,9 @@ DirCacheEntry(final byte[] sharedInfo, final int infoAt,
NB.readFully(in, info, infoOffset, INFO_LEN);
- int pathLen = NB.decodeUInt16(info, infoOffset + P_FLAGS) & 0xfff;
+ int pathLen = NB.decodeUInt16(info, infoOffset + P_FLAGS) & NAME_MASK;
+ if (pathLen == NAME_MASK)
+ throw new IOException("Path name too long for jgit");
path = new byte[pathLen];
NB.readFully(in, path, 0, pathLen);
@@ -135,6 +140,8 @@ public DirCacheEntry(final byte[] newPath) {
infoOffset = 0;
path = newPath;
+ if (path.length >= NAME_MASK)
+ throw new IllegalArgumentException("Path name too long for jgit");
NB.encodeInt16(info, infoOffset + P_FLAGS, path.length);
}
@@ -364,10 +371,10 @@ public String getPathString() {
* the entry to copy ObjectId and meta fields from.
*/
public void copyMetaData(final DirCacheEntry src) {
- final int pLen = NB.decodeUInt16(info, infoOffset + P_FLAGS) & 0xfff;
+ final int pLen = NB.decodeUInt16(info, infoOffset + P_FLAGS) & NAME_MASK;
System.arraycopy(src.info, src.infoOffset, info, infoOffset, INFO_LEN);
NB.encodeInt16(info, infoOffset + P_FLAGS, pLen
- | NB.decodeUInt16(info, infoOffset + P_FLAGS) & ~0xfff);
+ | NB.decodeUInt16(info, infoOffset + P_FLAGS) & ~NAME_MASK);
}
private long decodeTS(final int pIdx) {
--
1.6.0.87.g2858d
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
