summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/resources/org
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2010-07-02 18:21:55 -0700
committerShawn O. Pearce <spearce@spearce.org>2010-07-16 10:12:04 -0700
commit0b46e70155e1a14edc77f32e030094fb499887cf (patch)
treeb9bdd42bbd0c833041f911f73dc64a3b7fc83670 /org.eclipse.jgit/resources/org
parentb840ed0121dfee935d503208db96639b04f7110f (diff)
downloadjgit-0b46e70155e1a14edc77f32e030094fb499887cf.tar.gz
jgit-0b46e70155e1a14edc77f32e030094fb499887cf.zip
Fix infinite loop in IndexPack
A programming error using the Inflater API led to an infinite loop within IndexPack, caused by the Inflater returning 0 from the inflate() method, but it didn't want more input. This happens when it has reached the end of the stream, or has reached a spot asking for an external dictionary. Such a case is a failure for us, and we should abort out. Thanks to Alex for pointing out that we had 3 implementations of the inflate rountine, which should be consolidated into one and use a switch to determine where to load data from. Bug: 317416 Change-Id: I34120482375b687ea36ed9154002d77047e94b1f Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'org.eclipse.jgit/resources/org')
-rw-r--r--org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties1
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
index 4a54089e06..e4a603cbba 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
@@ -357,6 +357,7 @@ unknownIndexVersionOrCorruptIndex=Unknown index version (or corrupt index): {0}
unknownObjectType=Unknown object type {0}.
unknownRepositoryFormat2=Unknown repository format "{0}"; expected "0".
unknownRepositoryFormat=Unknown repository format
+unknownZlibError=Unknown zlib error.
unmergedPath=Unmerged path: {0}
unpackError=unpack error {0}
unreadablePackIndex=Unreadable pack index: {0}