From e2f5716c940c5da22cbb3b0b08cb4ee7f2970580 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Fri, 6 Aug 2010 09:33:55 -0700 Subject: [PATCH] Fix ArrayIndexOutOfBounds on non-square exact rename matrix If the exact rename matrix for a particular ObjectId isn't square we crashed with an ArrayIndexOutOfBoundsException because the matrix entries were encoded backwards. The encode function accepts the source (aka deleted) index first, not second. Add a unit test to cover this non-square case to ensure we don't have this regression in the future. Change-Id: I5b005e5093e1f00de2e3ec104e27ab6820203566 Signed-off-by: Shawn O. Pearce --- .../tst/org/eclipse/jgit/diff/RenameDetectorTest.java | 5 ++++- .../src/org/eclipse/jgit/diff/RenameDetector.java | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RenameDetectorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RenameDetectorTest.java index 6024c7699..b5d94c02c 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RenameDetectorTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RenameDetectorTest.java @@ -173,17 +173,20 @@ public class RenameDetectorTest extends RepositoryTestCase { DiffEntry c = DiffEntry.add("c.txt", foo); DiffEntry d = DiffEntry.delete("d.txt", foo); + DiffEntry e = DiffEntry.add("the_e_file.txt", foo); // Add out of order to avoid first-match succeeding rd.add(a); rd.add(d); + rd.add(e); rd.add(b); rd.add(c); List entries = rd.compute(); - assertEquals(2, entries.size()); + assertEquals(3, entries.size()); assertRename(d, c, 100, entries.get(0)); assertRename(b, a, 100, entries.get(1)); + assertCopy(d, e, 100, entries.get(2)); } public void testExactRename_OneDeleteManyAdds() throws Exception { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/RenameDetector.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/RenameDetector.java index cf5615a1c..ad37a7372 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/RenameDetector.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/RenameDetector.java @@ -390,14 +390,14 @@ public class RenameDetector { List dels = (List) o; long[] matrix = new long[dels.size() * adds.size()]; int mNext = 0; - for (int addIdx = 0; addIdx < adds.size(); addIdx++) { - String addedName = adds.get(addIdx).newName; + for (int delIdx = 0; delIdx < dels.size(); delIdx++) { + String deletedName = dels.get(delIdx).oldName; - for (int delIdx = 0; delIdx < dels.size(); delIdx++) { - String deletedName = dels.get(delIdx).oldName; + for (int addIdx = 0; addIdx < adds.size(); addIdx++) { + String addedName = adds.get(addIdx).newName; int score = SimilarityRenameDetector.nameScore(addedName, deletedName); - matrix[mNext] = SimilarityRenameDetector.encode(score, addIdx, delIdx); + matrix[mNext] = SimilarityRenameDetector.encode(score, delIdx, addIdx); mNext++; } }