Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2013-04-10 15:57:12 +0000
committerThomas Watson2013-04-10 15:57:12 +0000
commit671f70606091d87ad97c36ae13febe49cf69cf11 (patch)
tree837c661b00528bf7af497fafd119a24cb301fdfa
parent5ad325360d09f89d8cb3766164e9340041aec535 (diff)
downloadrt.equinox.framework-671f70606091d87ad97c36ae13febe49cf69cf11.tar.gz
rt.equinox.framework-671f70606091d87ad97c36ae13febe49cf69cf11.tar.xz
rt.equinox.framework-671f70606091d87ad97c36ae13febe49cf69cf11.zip
Bug 395274 - Equinox returns valid bundle entries for invalid paths I20130423-0800I20130416-0800
- avoid unnecessary call to getCononicalPath
-rw-r--r--bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirBundleFile.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirBundleFile.java b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirBundleFile.java
index 890104a4e..e94db2ca7 100644
--- a/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirBundleFile.java
+++ b/bundles/org.eclipse.osgi/defaultAdaptor/src/org/eclipse/osgi/baseadaptor/bundlefile/DirBundleFile.java
@@ -94,7 +94,7 @@ public class DirBundleFile extends BundleFile {
}
// must do an extra check to make sure file is within the bundle (bug 320546)
if (checkInBundle) {
- if (!canonicalFile.getPath().startsWith(BundleFile.secureAction.getCanonicalPath(basefile)))
+ if (!canonicalFile.getPath().startsWith(basefile.getPath()))
return null;
}
} catch (IOException e) {

Back to the top