Bug 1178076 - MessagePort should not set listeners nor workerFeature when neutered, r=smaug

This commit is contained in:
Andrea Marchesini 2015-06-29 14:52:49 +01:00
parent 7c92956522
commit 18fe8fbabb
3 changed files with 45 additions and 1 deletions

View File

@ -386,8 +386,13 @@ MessagePort::Initialize(const nsID& aUUID,
mNextStep = eNextStepNone;
if (mNeutered) {
// If this port is neutered we don't want to keep it alive artificially nor
// we want to add listeners or workerFeatures.
mState = eStateDisentangled;
} else if (mState == eStateEntangling) {
return;
}
if (mState == eStateEntangling) {
ConnectToPBackground();
} else {
MOZ_ASSERT(mState == eStateUnshippedEntangled);

View File

@ -24,3 +24,4 @@ support-files =
[test_messageChannel_sharedWorker2.html]
[test_messageChannel_any.html]
[test_messageChannel_forceClose.html]
[test_messageChannel_bug1178076.html]

View File

@ -0,0 +1,38 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=1178076
-->
<head>
<meta charset="utf-8">
<title>Test for Bug 1178076</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1178076">Mozilla Bug 1178076</a>
<div id="content"></div>
<pre id="test">
</pre>
<script type="application/javascript">
function runTest() {
onmessage = function(e) {
ok(e.ports.length, 1, "A port has been received!");
var port = e.ports[0];
ok(port instanceof MessagePort, "This is a port.");
SimpleTest.finish();
}
// In this test we want to see if we leak a neutered port closing port1
// and sending port2 to the same window. This operation doesn't involve IPC.
var mc = new MessageChannel();
mc.port1.close();
postMessage(42, '*', [mc.port2]);
}
SimpleTest.waitForExplicitFinish();
SpecialPowers.pushPrefEnv({"set": [["dom.messageChannel.enabled", true]]}, runTest);
</script>
</body>
</html>