Bug 381724 - [jobs] ISchedulingRule security vulnerability

2 files changed, 27 insertions, 1 deletions

diff --git a/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ThreadJob.java b/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ThreadJob.java
index 1332932e4..102bf2e9f 100644
--- a/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ThreadJob.java
+++ b/bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ThreadJob.java
@@ -329,7 +329,7 @@ class ThreadJob extends Job {
 		if (JobManager.DEBUG_BEGIN_END)
 			lastPush = (RuntimeException) new RuntimeException().fillInStackTrace();
 		//check for containment last because we don't want to fail again on endRule
-		if (baseRule != null && rule != null && !baseRule.contains(rule))
+		if (baseRule != null && rule != null && !(baseRule.contains(rule) && baseRule.isConflicting(rule)))
 			illegalPush(rule, baseRule);
 	}
 
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IJobManagerTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IJobManagerTest.java
index b8b3837d1..bacbcc99d 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IJobManagerTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IJobManagerTest.java
@@ -137,6 +137,32 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		//		manager.startup();
 	}
 
+	public void testBeginInvalidNestedRules() {
+		final ISchedulingRule root = new PathRule("/");
+		final ISchedulingRule invalid = new ISchedulingRule() {
+			public boolean isConflicting(ISchedulingRule rule) {
+				return this == rule;
+			}
+
+			public boolean contains(ISchedulingRule rule) {
+				return this == rule || root.contains(rule);
+			}
+		};
+		try {
+			Job.getJobManager().beginRule(invalid, null);
+			try {
+				Job.getJobManager().beginRule(root, null);
+				fail("1.0");
+			} catch (IllegalArgumentException e) {
+				// expected
+			} finally {
+				Job.getJobManager().endRule(root);
+			}
+		} finally {
+			Job.getJobManager().endRule(invalid);
+		}
+	}
+
 	/**
 	 * Tests running a job that begins a rule but never ends it
 	 */