motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "testMaliciousPathEmpty fails on Windows"

This commit is contained in:
Christian Halstrick 2013-11-04 07:39:43 -05:00 committed by Gerrit Code Review @ Eclipse.org
parent 17dc02a579 98bc384d2b
commit b686fa45b6
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutMaliciousPathTest.java
View File

@ -54,6 +54,7 @@
import org.junit.Test; import org.junit.Test;
public class DirCacheCheckoutMaliciousPathTest extends RepositoryTestCase { public class DirCacheCheckoutMaliciousPathTest extends RepositoryTestCase {
protected ObjectId theHead; protected ObjectId theHead;
protected ObjectId theMerge; protected ObjectId theMerge;
@ -230,8 +231,14 @@ public void testMaliciousPathDot() throws Exception {
} }
@Test @Test
public void testMaliciousPathEmpty() throws Exception { public void testMaliciousPathEmptyUnix() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setCurrentPlatform(); ((MockSystemReader) SystemReader.getInstance()).setUnix();
testMaliciousPathBadFirstCheckout("", "no");
}
@Test
public void testMaliciousPathEmptyWindows() throws Exception {
((MockSystemReader) SystemReader.getInstance()).setWindows();
testMaliciousPathBadFirstCheckout("", "no"); testMaliciousPathBadFirstCheckout("", "no");
} }

1
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
View File

@ -1202,6 +1202,7 @@ private static boolean isValidPathSegment(CanonicalTreeParser t) {
// Space or period at end of file name is ignored by Windows. // Space or period at end of file name is ignored by Windows.
// Treat this as a bad path for now. We may want to handle // Treat this as a bad path for now. We may want to handle
// this as case insensitivity in the future. // this as case insensitivity in the future.
if (ptr > 0)
if (raw[ptr - 1] == '.' || raw[ptr - 1] == ' ') if (raw[ptr - 1] == '.' || raw[ptr - 1] == ' ')
return false; return false;
int i; int i;