From d62350d907f5ec91f17c645b8cfb2c76edf1cb5e Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Tue, 18 Jan 2011 17:14:15 -0800 Subject: Ensure all deltas were resolved in a pack If a pack uses OFS_DELTA only (e.g. its an initial push to a repository) and PackParser's implementation is broken such that the delta chain that hangs below a particular object offset is empty, the entryCount won't match the expected objectCount. Fail fast rather than claiming the stream was parsed correctly. The current implementation is not broken as described above. I broke the code when I implemented my own new subclass of PackParser (which incorrectly mucked with the object offset information), leading me to discover this consistency check was missing. Change-Id: I07540f0ae1144ef6f3bda48774dbdefb8876e1d3 Signed-off-by: Shawn O. Pearce Signed-off-by: Chris Aniszczyk --- org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java index 54e7dd989f..06819d3efe 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java @@ -409,6 +409,12 @@ public abstract class PackParser { } resolveDeltasWithExternalBases(progress); + + if (entryCount < objectCount) { + throw new IOException(MessageFormat.format(JGitText + .get().packHasUnresolvedDeltas, + (objectCount - entryCount))); + } } } -- cgit v1.2.3