Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Unified Diff: editor/tools/plugins/com.google.dart.tools.deploy/src/com/google/dart/tools/ui/omni/elements/FileProvider.java

Issue 10534166: Fix to prevent traversal into '.' directories when collecting file search proposals. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: editor/tools/plugins/com.google.dart.tools.deploy/src/com/google/dart/tools/ui/omni/elements/FileProvider.java
===================================================================
--- editor/tools/plugins/com.google.dart.tools.deploy/src/com/google/dart/tools/ui/omni/elements/FileProvider.java (revision 8668)
+++ editor/tools/plugins/com.google.dart.tools.deploy/src/com/google/dart/tools/ui/omni/elements/FileProvider.java (working copy)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, the Dart project authors.
+ * Copyright (c) 2012, the Dart project authors.
*
* Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
@@ -61,9 +61,6 @@
}
}
- /**
- * @return
- */
public OmniElement[] getFiles() {
return matches.toArray(EMPTY_ARRAY);
}
@@ -130,7 +127,7 @@
matches.add(new FileElement(FileProvider.this, (IFile) resource));
}
- if (resource.getType() == IResource.FOLDER && resource.isDerived()) {
+ if (resource.getType() == IResource.FOLDER && !shouldTraverseFolder(resource)) {
return false;
}
@@ -162,6 +159,15 @@
}
return matches(name);
}
+
+ private boolean shouldTraverseFolder(IResource resource) {
+ if (resource.isDerived()) {
+ return false;
+ }
+
+ String name = resource.getName();
+ return name != null && !name.startsWith(".");
pquitslund 2012/06/14 21:02:20 Since I'm in NPE-squashing mode I'm being extra sa
+ }
}
/**
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698