- tbb-commits - lists.torproject.org

[tor-browser/esr24] Bug 969226 - Check if there is enough data to read u32 to avoid buffer overflow. r=bgirard, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 5977bbe71d2afc1b836080515fb9503db4a14bfa Author: Jeff Muizelaar <jmuizelaar(a)mozilla.com> Date: Fri Apr 11 10:25:01 2014 -0400 Bug 969226 - Check if there is enough data to read u32 to avoid buffer overflow. r=bgirard, a=abillings --- gfx/qcms/iccread.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gfx/qcms/iccread.c b/gfx/qcms/iccread.c index 5c72cf3..63bd090 100644 --- a/gfx/qcms/iccread.c +++ b/gfx/qcms/iccread.c @@ -1007,6 +1007,9 @@ qcms_profile* qcms_profile_from_memory(const void *mem, size_t size) source.size = size; source.valid = true; + if (size < 4) + return INVALID_PROFILE; + length = read_u32(src, 0); if (length <= size) { // shrink the area that we can read if appropriate

1 0

[tor-browser/esr24] Bug 966843 - Fix intermittent browser_615394-SSWindowState_events.js hangs. r=smacleod, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 467f9d81557f5f1222ca451340be61547b07c9ef Author: Tim Taubert <ttaubert(a)mozilla.com> Date: Mon Apr 14 12:03:18 2014 +0200 Bug 966843 - Fix intermittent browser_615394-SSWindowState_events.js hangs. r=smacleod, a=test-only --- .../sessionstore/test/browser_615394-SSWindowState_events.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/browser/components/sessionstore/test/browser_615394-SSWindowState_events.js b/browser/components/sessionstore/test/browser_615394-SSWindowState_events.js index f699083..26064be 100644 --- a/browser/components/sessionstore/test/browser_615394-SSWindowState_events.js +++ b/browser/components/sessionstore/test/browser_615394-SSWindowState_events.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -const stateBackup = ss.getBrowserState(); +const stateBackup = JSON.parse(ss.getBrowserState()); const testState = { windows: [{ tabs: [ @@ -73,8 +73,7 @@ function runNextTest() { waitForBrowserState(testState, currentTest); } else { - ss.setBrowserState(stateBackup); - finish(); + waitForBrowserState(stateBackup, finish); } }

1 0

[tor-browser/esr24] Bug 944353. If we've had a decoder error then the image is not usable. r=seth a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 92a295290dd3e45c8df0749372db1891f04e5034 Author: Timothy Nikkel <tnikkel(a)gmail.com> Date: Wed Feb 26 21:48:51 2014 -0600 Bug 944353. If we've had a decoder error then the image is not usable. r=seth a=sledru This matches what RasterImage will do. --- image/src/Decoder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/src/Decoder.cpp b/image/src/Decoder.cpp index 85845f6..2e3b36f 100644 --- a/image/src/Decoder.cpp +++ b/image/src/Decoder.cpp @@ -154,7 +154,7 @@ Decoder::Finish(RasterImage::eShutdownIntent aShutdownIntent) } } - bool usable = true; + bool usable = !HasDecoderError(); if (aShutdownIntent != RasterImage::eShutdownIntent_NotNeeded && !HasDecoderError()) { // If we only have a data error, we're usable if we have at least one complete frame. if (GetCompleteFrameCount() == 0) {

1 0

[tor-browser/esr24] No bug, Automated blocklist update from host bld-linux64-spot-084 - a=blocklist-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit f1040dc694dca0a7dfb91a834bea0aa01ea64fec Author: ffxbld <none@none> Date: Sat Apr 12 03:11:06 2014 -0700 No bug, Automated blocklist update from host bld-linux64-spot-084 - a=blocklist-update --- browser/app/blocklist.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml index 6b94ea0..5f776e3 100644 --- a/browser/app/blocklist.xml +++ b/browser/app/blocklist.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1396307847000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1396993434000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -2075,6 +2075,12 @@ <pluginItem blockID="p558"> <match name="description" exp="^($|Unity Web Player version ([0-3]|(4\.([0-2]|3(\.[0-4])?[^0-9.]))))" /> <match name="filename" exp="Unity Web Player\.plugin" /> <versionRange severity="0" vulnerabilitystatus="1"></versionRange> </pluginItem> + <pluginItem blockID="p572"> + <match name="filename" exp="npdjvu\.dll" /> <versionRange minVersion="0" maxVersion="6.1.4.27993" severity="0" vulnerabilitystatus="1"></versionRange> + </pluginItem> + <pluginItem blockID="p574"> + <match name="filename" exp="NPDjVu\.plugin" /> <versionRange minVersion="0" maxVersion="6.1.1" severity="0" vulnerabilitystatus="1"></versionRange> + </pluginItem> </pluginItems> <gfxItems>

1 0

[tor-browser/esr24] Bug 944353. If we've encountered an error while decoding an image and the main thread has asked to do more decoding of that image before the main thread has acknowledged the error then refuse to decode more. r=seth a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 69f9b401dfffdc377205f0fa77d0894a812ad9d6 Author: Timothy Nikkel <tnikkel(a)gmail.com> Date: Wed Feb 26 21:48:47 2014 -0600 Bug 944353. If we've encountered an error while decoding an image and the main thread has asked to do more decoding of that image before the main thread has acknowledged the error then refuse to decode more. r=seth a=sledru --- image/src/RasterImage.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/image/src/RasterImage.cpp b/image/src/RasterImage.cpp index 8b066434..42d4232 100644 --- a/image/src/RasterImage.cpp +++ b/image/src/RasterImage.cpp @@ -3398,6 +3398,11 @@ RasterImage::DecodePool::DecodeSomeOfImage(RasterImage* aImg, if (aImg->mError) return NS_OK; + // If there is an error worker pending (say because the main thread has enqueued + // another decode request for us before processing the error worker) then bail out. + if (aImg->mPendingError) + return NS_OK; + // If mDecoded or we don't have a decoder, we must have finished already (for // example, a synchronous decode request came while the worker was pending). if (!aImg->mDecoder || aImg->mDecoded)

1 0

[tor-browser/esr24] No bug, Automated HSTS preload list update from host bld-linux64-spot-474 - a=hsts-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit b1450ea59fa01396210dbea13d3e02a5fb229c8f Author: ffxbld <none@none> Date: Sat Apr 12 03:14:06 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-474 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 10 ++++++---- security/manager/boot/src/nsSTSPreloadList.inc | 13 ++++++++++++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index 342aec9..cfe99ee 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -11,7 +11,6 @@ betnet.fr: could not connect to host bigshinylock.minazo.net: could not connect to host blacklane.com: did not receive HSTS header braintreegateway.com: did not receive HSTS header -braintreepayments.com: did not receive HSTS header browserid.org: did not receive HSTS header business.medbank.com.mt: did not receive HSTS header carlolly.co.uk: did not receive HSTS header @@ -25,14 +24,16 @@ codereview.chromium.org: did not receive HSTS header crate.io: did not receive HSTS header crowdcurity.com: did not receive HSTS header crypto.is: did not receive HSTS header -csawctf.poly.edu: did not receive HSTS header +csawctf.poly.edu: could not connect to host dl.google.com: did not receive HSTS header docs.google.com: did not receive HSTS header +donmez.ws: could not connect to host drive.google.com: did not receive HSTS header dropcam.com: did not receive HSTS header email.lookout.com: could not connect to host emailprivacytester.com: did not receive HSTS header encrypted.google.com: did not receive HSTS header +errors.zenpayroll.com: could not connect to host espra.com: could not connect to host fatzebra.com.au: did not receive HSTS header fj.simple.com: did not receive HSTS header @@ -66,7 +67,7 @@ mydigipass.com: did not receive HSTS header mykolab.com: did not receive HSTS header neonisi.com: could not connect to host nexth.de: could not connect to host -nexth.net: could not connect to host +nexth.net: did not receive HSTS header nexth.us: could not connect to host openshift.redhat.com: did not receive HSTS header ottospora.nl: could not connect to host @@ -84,6 +85,7 @@ prodpad.com: did not receive HSTS header profiles.google.com: did not receive HSTS header rapidresearch.me: did not receive HSTS header sah3.net: could not connect to host +sandbox.mydigipass.com: could not connect to host saturngames.co.uk: did not receive HSTS header script.google.com: did not receive HSTS header security.google.com: did not receive HSTS header @@ -94,7 +96,7 @@ simon.butcher.name: max-age too low: 2629743 sites.google.com: did not receive HSTS header sol.io: could not connect to host souyar.de: could not connect to host -souyar.net: could not connect to host +souyar.net: did not receive HSTS header souyar.us: could not connect to host spreadsheets.google.com: did not receive HSTS header square.com: did not receive HSTS header diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index 2f909b9..b547933 100644 --- a/security/manager/boot/src/nsSTSPreloadList.inc +++ b/security/manager/boot/src/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/ #include "mozilla/StandardInteger.h" -const PRTime gPreloadListExpirationTime = INT64_C(1407578787593000); +const PRTime gPreloadListExpirationTime = INT64_C(1408183539445000); class nsSTSPreload { @@ -20,6 +20,7 @@ class nsSTSPreload static const nsSTSPreload kSTSPreloadList[] = { { "accounts.google.com", true }, { "aclu.org", false }, + { "activiti.alfresco.com", false }, { "aladdinschools.appspot.com", false }, { "alpha.irccloud.com", false }, { "api.intercom.io", false }, @@ -36,6 +37,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "blog.lookout.com", false }, { "blog.torproject.org", false }, { "boxcryptor.com", true }, + { "braintreepayments.com", false }, { "bugzilla.mozilla.org", true }, { "business.lookout.com", false }, { "calyxinstitute.org", false }, @@ -59,10 +61,12 @@ static const nsSTSPreload kSTSPreloadList[] = { { "dist.torproject.org", false }, { "dm.lookout.com", false }, { "dm.mylookout.com", false }, + { "docs.python.org", true }, { "download.jitsi.org", false }, { "ebanking.indovinabank.com.vn", false }, { "ecosystem.atlassian.net", true }, { "eff.org", true }, + { "encircleapp.com", true }, { "entropia.de", false }, { "epoxate.com", false }, { "errors.zenpayroll.com", false }, @@ -89,6 +93,8 @@ static const nsSTSPreload kSTSPreloadList[] = { { "inertianetworks.com", true }, { "intercom.io", false }, { "itriskltd.com", true }, + { "keeperapp.com", true }, + { "keepersecurity.com", true }, { "keyerror.com", true }, { "kinsights.com", false }, { "lastpass.com", false }, @@ -125,6 +131,8 @@ static const nsSTSPreload kSTSPreloadList[] = { { "mylookout.com", false }, { "neg9.org", false }, { "neilwynne.com", false }, + { "onedrive.com", true }, + { "onedrive.live.com", false }, { "oplop.appspot.com", true }, { "opsmate.com", false }, { "p.linode.com", false }, @@ -141,6 +149,8 @@ static const nsSTSPreload kSTSPreloadList[] = { { "plus.google.com", false }, { "plus.sandbox.google.com", false }, { "publications.qld.gov.au", false }, + { "pypi.python.org", true }, + { "python.org", false }, { "riseup.net", true }, { "roddis.net", false }, { "romab.com", true }, @@ -190,6 +200,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "www.mylookout.com", false }, { "www.noisebridge.net", false }, { "www.opsmate.com", true }, + { "www.python.org", true }, { "www.simbolo.co.uk", false }, { "www.simple.com", false }, { "www.therapynotes.com", false },

1 0

[tor-browser/esr24] Bug 995041 - Properly disable the problematic portions of browser_aboutHome.js. a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 06467b96cdedd70af1f741d72a45a051b14288ac Author: Gavin Sharp <gavin(a)gavinsharp.com> Date: Wed Jan 8 15:58:47 2014 -0500 Bug 995041 - Properly disable the problematic portions of browser_aboutHome.js. a=test-only --- browser/base/content/test/Makefile.in | 5 ++--- browser/base/content/test/browser_aboutHome.js | 8 ++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in index d41a36f..104ad59 100644 --- a/browser/base/content/test/Makefile.in +++ b/browser/base/content/test/Makefile.in @@ -67,13 +67,14 @@ MOCHITEST_BROWSER_FILES = \ browser_keywordSearch_postData.js \ POSTSearchEngine.xml \ print_postdata.sjs \ + browser_aboutHome.js \ browser_alltabslistener.js \ browser_bug304198.js \ title_test.svg \ browser_bug329212.js \ browser_bug356571.js \ browser_bug380960.js \ - browser_bug386835.js \ + browser_bug386835.js \ browser_bug405137.js \ browser_bug406216.js \ browser_bug409481.js \ @@ -360,12 +361,10 @@ MOCHITEST_BROWSER_FILES += \ endif # browser_aboutHealthReport.js disabled for frequent failures on Linux (bug 924307) -# browser_aboutHome.js disabled for frequent failures on Linux (bug 945667) # browser_CTP_context_menu.js fails intermittently on Linux (bug 909342) ifndef MOZ_WIDGET_GTK MOCHITEST_BROWSER_FILES += \ browser_aboutHealthReport.js \ - browser_aboutHome.js \ browser_CTP_context_menu.js \ $(NULL) endif diff --git a/browser/base/content/test/browser_aboutHome.js b/browser/base/content/test/browser_aboutHome.js index a890d5f..3edbc56 100644 --- a/browser/base/content/test/browser_aboutHome.js +++ b/browser/base/content/test/browser_aboutHome.js @@ -88,11 +88,19 @@ let gTests = [ } }, +// Disabled on Linux for intermittent issues with FHR, see Bug 945667. +// Disabled always due to bug 992485 { desc: "Check that performing a search fires a search event and records to " + "Firefox Health Report.", setup: function () { }, run: function () { + // Skip this test always for now since it loads google.com and that causes bug 992485 + return; + + // Skip this test on Linux. + if (navigator.platform.indexOf("Linux") == 0) { return; } + try { let cm = Cc["@mozilla.org/categorymanager;1"].getService(Ci.nsICategoryManager); cm.getCategoryEntry("healthreport-js-provider-default", "SearchesProvider");

1 0

[tor-browser/esr24] No Bug - Fix browser_net_timing-division.js leak when run as the last test on a CLOSED TREE. rs=past, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit d2fd29446d9cf264383984ee0a055fe4e3f8fedd Author: Tim Taubert <tim(a)timtaubert.de> Date: Fri Apr 11 09:12:47 2014 +0200 No Bug - Fix browser_net_timing-division.js leak when run as the last test on a CLOSED TREE. rs=past, a=test-only --- browser/devtools/netmonitor/test/head.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/devtools/netmonitor/test/head.js b/browser/devtools/netmonitor/test/head.js index 16cec27..dca1dc3 100644 --- a/browser/devtools/netmonitor/test/head.js +++ b/browser/devtools/netmonitor/test/head.js @@ -115,7 +115,7 @@ function teardown(aMonitor) { let deferred = Promise.defer(); let tab = aMonitor.target.tab; - aMonitor.once("destroyed", deferred.resolve); + aMonitor.once("destroyed", () => executeSoon(deferred.resolve)); removeTab(tab); return deferred.promise;

1 0

[tor-browser/esr24] Bug 966006. r=mcmanus a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit b14cced3e448b5d5eec98675909a42a156e478cb Author: Nicholas Hurley <hurley(a)todesschaf.org> Date: Tue Apr 8 12:41:17 2014 -0700 Bug 966006. r=mcmanus a=abillings --- netwerk/dns/nsHostResolver.cpp | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/netwerk/dns/nsHostResolver.cpp b/netwerk/dns/nsHostResolver.cpp index ef652f9..72eec6a 100644 --- a/netwerk/dns/nsHostResolver.cpp +++ b/netwerk/dns/nsHostResolver.cpp @@ -549,18 +549,22 @@ nsHostResolver::ResolveHost(const char *host, // For entries that are in the grace period with a failed connect, // or all cached negative entries, use the cache but start a new lookup in // the background - if ((((TimeStamp::NowLoRes() > he->rec->expiration) && - he->rec->mBlacklistedItems.Length()) || - he->rec->negative) && !he->rec->resolving) { - LOG(("Using %s cache entry for host [%s] but starting async renewal.", - he->rec->negative ? "negative" :"positive", host)); - IssueLookup(he->rec); - - if (!he->rec->negative) { - // negative entries are constantly being refreshed, only - // track positive grace period induced renewals - Telemetry::Accumulate(Telemetry::DNS_LOOKUP_METHOD2, - METHOD_RENEWAL); + { + MutexAutoLock lock(he->rec->addr_info_lock); + + if ((((TimeStamp::NowLoRes() > he->rec->expiration) && + he->rec->mBlacklistedItems.Length()) || + he->rec->negative) && !he->rec->resolving) { + LOG(("Using %s cache entry for host [%s] but starting async renewal.", + he->rec->negative ? "negative" :"positive", host)); + IssueLookup(he->rec); + + if (!he->rec->negative) { + // negative entries are constantly being refreshed, only + // track positive grace period induced renewals + Telemetry::Accumulate(Telemetry::DNS_LOOKUP_METHOD2, + METHOD_RENEWAL); + } } }

1 0

[tor-browser/esr24] Bug 987892 - Clear up oranges for debug mochitest-browser-chrome jobs, disable browser_connections.js test. r=armenzg, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit bce807354b26028d362f6b8afae9bdcc9aff12ce Author: Joel Maher <jmaher(a)mozilla.com> Date: Wed Apr 9 16:08:12 2014 -0400 Bug 987892 - Clear up oranges for debug mochitest-browser-chrome jobs, disable browser_connections.js test. r=armenzg, a=test-only --- browser/components/preferences/in-content/tests/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/components/preferences/in-content/tests/Makefile.in b/browser/components/preferences/in-content/tests/Makefile.in index d0a13ed..fea500e 100644 --- a/browser/components/preferences/in-content/tests/Makefile.in +++ b/browser/components/preferences/in-content/tests/Makefile.in @@ -14,7 +14,6 @@ MOCHITEST_BROWSER_FILES := \ head.js \ browser_advanced_update.js \ browser_bug731866.js \ - browser_connection.js \ browser_privacypane_1.js \ browser_privacypane_3.js \ browser_privacypane_4.js \

1 0

[tor-browser/esr24] Bug 986678 - Fix type check in TryAddTypeBarrierForWrite. r=bhackett, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 71a0e59c9902c90b02ba0a2897ad1a23a60be472 Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Fri Apr 4 19:38:10 2014 +0200 Bug 986678 - Fix type check in TryAddTypeBarrierForWrite. r=bhackett, a=abillings --- js/src/jit/MIR.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/src/jit/MIR.cpp b/js/src/jit/MIR.cpp index eea62ff..ef20000 100644 --- a/js/src/jit/MIR.cpp +++ b/js/src/jit/MIR.cpp @@ -2701,10 +2701,10 @@ TryAddTypeBarrierForWrite(JSContext *cx, MBasicBlock *current, types::StackTypeS case MIRType_String: { // The property is a particular primitive type, guard by unboxing the // value before the write. - if ((*pvalue)->type() != MIRType_Value) { - // The value is a different primitive, just do a VM call as it will - // always trigger invalidation of the compiled code. - JS_ASSERT((*pvalue)->type() != propertyType); + if (!(*pvalue)->mightBeType(propertyType)) { + // The value's type does not match the property type. Just do a VM + // call as it will always trigger invalidation of the compiled code. + JS_ASSERT_IF((*pvalue)->type() != MIRType_Value, (*pvalue)->type() != propertyType); return false; } MInstruction *ins = MUnbox::New(*pvalue, propertyType, MUnbox::Fallible);

1 0

[tor-browser/esr24] Bug 986843 - Replace AutoHoldZone with AutoCompartmentRooter. r=terrence, a=lsblakk
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit dcaf26b42bbfbb61c7ed1df992c3919052fa82a9 Author: Jon Coppeard <jcoppeard(a)mozilla.com> Date: Mon Mar 24 21:45:23 2014 +0000 Bug 986843 - Replace AutoHoldZone with AutoCompartmentRooter. r=terrence, a=lsblakk --- js/src/gc/RootMarking.cpp | 2 +- js/src/gc/Zone.cpp | 11 ++++++++++- js/src/gc/Zone.h | 4 ++-- js/src/jsapi.cpp | 29 ++++++++++++++++++----------- js/src/jscompartment.cpp | 2 +- js/src/jscompartment.h | 2 +- js/src/jsgc.cpp | 8 +++++--- 7 files changed, 38 insertions(+), 20 deletions(-) diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp index 861c2d6..88574f3 100644 --- a/js/src/gc/RootMarking.cpp +++ b/js/src/gc/RootMarking.cpp @@ -744,7 +744,7 @@ js::gc::MarkRuntime(JSTracer *trc, bool useSavedRoots) #endif for (CompartmentsIter c(rt); !c.done(); c.next()) - c->mark(trc); + c->markRoots(trc); /* The embedding can register additional roots here. */ for (size_t i = 0; i < rt->gcBlackRootTracers.length(); i++) { diff --git a/js/src/gc/Zone.cpp b/js/src/gc/Zone.cpp index 5625b99..e1f0147 100644 --- a/js/src/gc/Zone.cpp +++ b/js/src/gc/Zone.cpp @@ -23,7 +23,6 @@ using namespace js::gc; JS::Zone::Zone(JSRuntime *rt) : rt(rt), allocator(this), - hold(false), ionUsingBarriers_(false), active(false), gcScheduled(false), @@ -227,3 +226,13 @@ Zone::discardJitCode(FreeOp *fop, bool discardConstraints) } #endif } + +bool +Zone::hasMarkedCompartments() +{ + for (CompartmentsInZoneIter comp(this); !comp.done(); comp.next()) { + if (comp->marked) + return true; + } + return false; +} diff --git a/js/src/gc/Zone.h b/js/src/gc/Zone.h index 73e7043..d740306 100644 --- a/js/src/gc/Zone.h +++ b/js/src/gc/Zone.h @@ -108,8 +108,6 @@ struct Zone : private JS::shadow::Zone, js::CompartmentVector compartments; - bool hold; - private: bool ionUsingBarriers_; @@ -300,6 +298,8 @@ struct Zone : private JS::shadow::Zone, void sweep(js::FreeOp *fop, bool releaseTypes); + bool hasMarkedCompartments(); + private: void sweepBreakpoints(js::FreeOp *fop); }; diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp index 3632a74..68b6afa 100644 --- a/js/src/jsapi.cpp +++ b/js/src/jsapi.cpp @@ -3171,23 +3171,32 @@ JS_GetObjectId(JSContext *cx, JSObject *obj, jsid *idp) return JS_TRUE; } -class AutoHoldZone +class AutoCompartmentRooter : private JS::CustomAutoRooter { public: - explicit AutoHoldZone(Zone *zone - MOZ_GUARD_OBJECT_NOTIFIER_PARAM) - : holdp(&zone->hold) + explicit AutoCompartmentRooter(JSContext *cx, JSCompartment *comp + MOZ_GUARD_OBJECT_NOTIFIER_PARAM) + : CustomAutoRooter(cx), compartment(comp) { MOZ_GUARD_OBJECT_NOTIFIER_INIT; - *holdp = true; } - ~AutoHoldZone() { - *holdp = false; + operator JSCompartment *() { + return compartment; + } + + JSCompartment *operator->() { + return compartment; + } + + protected: + virtual void trace(JSTracer *trc) + { + compartment->mark(); } private: - bool *holdp; + JSCompartment *compartment; MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER }; @@ -3209,7 +3218,7 @@ JS_NewGlobalObject(JSContext *cx, JSClass *clasp, JSPrincipals *principals, else zone = ((JSObject *)options.zoneSpec)->zone(); - JSCompartment *compartment = NewCompartment(cx, zone, principals, options); + AutoCompartmentRooter compartment(cx, NewCompartment(cx, zone, principals, options)); if (!compartment) return NULL; @@ -3218,8 +3227,6 @@ JS_NewGlobalObject(JSContext *cx, JSClass *clasp, JSPrincipals *principals, rt->systemZone->isSystem = true; } - AutoHoldZone hold(compartment->zone()); - Rooted<GlobalObject *> global(cx); { AutoCompartment ac(cx, compartment); diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp index c448e10..2e66253 100644 --- a/js/src/jscompartment.cpp +++ b/js/src/jscompartment.cpp @@ -488,7 +488,7 @@ JSCompartment::markAllCrossCompartmentWrappers(JSTracer *trc) } void -JSCompartment::mark(JSTracer *trc) +JSCompartment::markRoots(JSTracer *trc) { #ifdef JS_ION if (ionCompartment_) diff --git a/js/src/jscompartment.h b/js/src/jscompartment.h index 6cc1bc8..1ef2ed8 100644 --- a/js/src/jscompartment.h +++ b/js/src/jscompartment.h @@ -293,7 +293,7 @@ struct JSCompartment WrapperEnum(JSCompartment *c) : js::WrapperMap::Enum(c->crossCompartmentWrappers) {} }; - void mark(JSTracer *trc); + void markRoots(JSTracer *trc); bool isDiscardingJitCode(JSTracer *trc); void sweep(js::FreeOp *fop, bool releaseTypes); void sweepCrossCompartmentWrappers(); diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp index 53a636e..0db550f 100644 --- a/js/src/jsgc.cpp +++ b/js/src/jsgc.cpp @@ -2541,8 +2541,10 @@ SweepZones(FreeOp *fop, bool lastGC) while (read < end) { Zone *zone = *read++; - if (!zone->hold && zone->wasGCStarted()) { - if (zone->allocator.arenas.arenaListsAreEmpty() || lastGC) { + if (zone->wasGCStarted()) { + if ((zone->allocator.arenas.arenaListsAreEmpty() && !zone->hasMarkedCompartments()) || + lastGC) + { zone->allocator.arenas.checkEmptyFreeLists(); if (callback) callback(zone); @@ -2723,7 +2725,7 @@ BeginMarkPhase(JSRuntime *rt) } zone->scheduledForDestruction = false; - zone->maybeAlive = zone->hold; + zone->maybeAlive = false; zone->setPreservingCode(false); }

1 0

[tor-browser/esr24] Bug 980537 - Only store FakeBackstagePass instances in mThisObjects. r=khuey, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 00d381db6844041ac1a6e3b8b6a9e2e1829c56fc Author: Bobby Holley <bobbyholley(a)gmail.com> Date: Sun Apr 6 12:32:39 2014 -0700 Bug 980537 - Only store FakeBackstagePass instances in mThisObjects. r=khuey, a=sledru --- js/xpconnect/loader/mozJSComponentLoader.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/mozJSComponentLoader.cpp index 06e3a30..ddc74ef 100644 --- a/js/xpconnect/loader/mozJSComponentLoader.cpp +++ b/js/xpconnect/loader/mozJSComponentLoader.cpp @@ -614,7 +614,9 @@ mozJSComponentLoader::NoteSubScript(HandleScript aScript, HandleObject aThisObje MOZ_CRASH(); } - mThisObjects.Put(aScript, aThisObject); + if (js::GetObjectJSClass(aThisObject) == &kFakeBackstagePassJSClass) { + mThisObjects.Put(aScript, aThisObject); + } } // Some stack based classes for cleaning up on early return @@ -1024,7 +1026,10 @@ mozJSComponentLoader::ObjectForLocation(nsIFile *aComponentFile, MOZ_ASSERT(tableScript); } - mThisObjects.Put(tableScript, obj); + if (js::GetObjectJSClass(obj) == &kFakeBackstagePassJSClass) { + MOZ_ASSERT(mReuseLoaderGlobal); + mThisObjects.Put(tableScript, obj); + } uint32_t oldopts = JS_GetOptions(cx); JS_SetOptions(cx, oldopts | (aPropagateExceptions ? JSOPTION_DONT_REPORT_UNCAUGHT : 0));

1 0

[tor-browser/esr24] Bug 987892 - disable 1 test for perma-orange on esr24. r=armenzg, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 1f5e460d063e39169d6feb889763a086e06bf47d Author: Joel Maher <jmaher(a)mozilla.com> Date: Mon Apr 7 14:53:31 2014 -0400 Bug 987892 - disable 1 test for perma-orange on esr24. r=armenzg, a=test-only --- browser/components/preferences/in-content/tests/Makefile.in | 1 - browser/components/preferences/tests/Makefile.in | 1 - 2 files changed, 2 deletions(-) diff --git a/browser/components/preferences/in-content/tests/Makefile.in b/browser/components/preferences/in-content/tests/Makefile.in index 9fe7713..d0a13ed 100644 --- a/browser/components/preferences/in-content/tests/Makefile.in +++ b/browser/components/preferences/in-content/tests/Makefile.in @@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk MOCHITEST_BROWSER_FILES := \ head.js \ browser_advanced_update.js \ - browser_bug410900.js \ browser_bug731866.js \ browser_connection.js \ browser_privacypane_1.js \ diff --git a/browser/components/preferences/tests/Makefile.in b/browser/components/preferences/tests/Makefile.in index cffc88f..459a4e9 100644 --- a/browser/components/preferences/tests/Makefile.in +++ b/browser/components/preferences/tests/Makefile.in @@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk MOCHITEST_BROWSER_FILES := \ head.js \ browser_advanced_update.js \ - browser_bug410900.js \ browser_bug705422.js \ browser_permissions.js \ browser_chunk_permissions.js \

1 0

[tor-browser/esr24] Bug 996009 - Ensure that the richtext2 browserscope tests do not attempt to contact the external network. r=roc, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 5eb2bb6325cdeaa666711df2c52a03fd743bf7f9 Author: Ehsan Akhgari <ehsan(a)mozilla.com> Date: Tue Apr 15 09:32:36 2014 -0400 Bug 996009 - Ensure that the richtext2 browserscope tests do not attempt to contact the external network. r=roc, a=test-only --- .../lib/richtext2/richtext2/tests/insert.py | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/insert.py b/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/insert.py index edf602a..a2e79c2 100644 --- a/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/insert.py +++ b/editor/libeditor/html/tests/browserscope/lib/richtext2/richtext2/tests/insert.py @@ -165,34 +165,34 @@ INSERT_TESTS = { 'tests': [ { 'id': 'IIMG:url_TEXT-1_SC', 'rte1-id': 'a-insertimage-0', - 'desc': 'Insert image with URL "http://goo.gl/bar.png"', - 'value': 'http://goo.gl/bar.png', + 'desc': 'Insert image with URL "bar.png"', + 'value': 'bar.png', 'checkAttrs': True, 'pad': 'foo^bar', - 'expected': [ 'foo<img src="http://goo.gl/bar.png">|bar', - 'foo<img src="http://goo.gl/bar.png">^bar' ] }, + 'expected': [ 'foo<img src="bar.png">|bar', + 'foo<img src="bar.png">^bar' ] }, { 'id': 'IIMG:url_IMG-1_SO', 'desc': 'Change existing image to new URL, selection on <img>', - 'value': 'http://baz.com/quz.png', + 'value': 'quz.png', 'checkAttrs': True, - 'pad': 'foo{<img src="http://goo.gl/bar.png">}bar', - 'expected': [ 'foo<img src="http://baz.com/quz.png"/>|bar', - 'foo<img src="http://baz.com/quz.png"/>^bar' ] }, + 'pad': 'foo{<img src="bar.png">}bar', + 'expected': [ 'foo<img src="quz.png"/>|bar', + 'foo<img src="quz.png"/>^bar' ] }, { 'id': 'IIMG:url_SPAN-IMG-1_SO', 'desc': 'Change existing image to new URL, selection in text surrounding <img>', - 'value': 'http://baz.com/quz.png', + 'value': 'quz.png', 'checkAttrs': True, - 'pad': 'foo[<img src="http://goo.gl/bar.png">]bar', - 'expected': [ 'foo<img src="http://baz.com/quz.png"/>|bar', - 'foo<img src="http://baz.com/quz.png"/>^bar' ] }, + 'pad': 'foo[<img src="bar.png">]bar', + 'expected': [ 'foo<img src="quz.png"/>|bar', + 'foo<img src="quz.png"/>^bar' ] }, { 'id': 'IIMG:._SPAN-IMG-1_SO', 'desc': 'Remove existing image or URL, selection on <img>', 'value': '', 'checkAttrs': True, - 'pad': 'foo{<img src="http://goo.gl/bar.png">}bar', + 'pad': 'foo{<img src="bar.png">}bar', 'expected': [ 'foo^bar', 'foo<img>|bar', 'foo<img>^bar', @@ -203,7 +203,7 @@ INSERT_TESTS = { 'desc': 'Remove existing image or URL, selection in text surrounding <img>', 'value': '', 'checkAttrs': True, - 'pad': 'foo[<img src="http://goo.gl/bar.png">]bar', + 'pad': 'foo[<img src="bar.png">]bar', 'expected': [ 'foo^bar', 'foo<img>|bar', 'foo<img>^bar',

1 0

[tor-browser/esr24] No bug, Automated HSTS preload list update from host bld-linux64-spot-126 - a=hsts-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit cd05cbc3690324f656e43ff3b5ba2d5a0ae37514 Author: ffxbld <none@none> Date: Sat Apr 5 03:15:28 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-126 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 2 +- security/manager/boot/src/nsSTSPreloadList.inc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index ec727af..342aec9 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -34,7 +34,6 @@ email.lookout.com: could not connect to host emailprivacytester.com: did not receive HSTS header encrypted.google.com: did not receive HSTS header espra.com: could not connect to host -factor.cc: could not connect to host fatzebra.com.au: did not receive HSTS header fj.simple.com: did not receive HSTS header get.zenpayroll.com: did not receive HSTS header @@ -45,6 +44,7 @@ googleplex.com: could not connect to host goto.google.com: did not receive HSTS header greplin.com: did not receive HSTS header groups.google.com: did not receive HSTS header +haste.ch: could not connect to host history.google.com: did not receive HSTS header hostedtalkgadget.google.com: did not receive HSTS header id.atlassian.com: did not receive HSTS header diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index b0d59de9..2f909b9 100644 --- a/security/manager/boot/src/nsSTSPreloadList.inc +++ b/security/manager/boot/src/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/ #include "mozilla/StandardInteger.h" -const PRTime gPreloadListExpirationTime = INT64_C(1406973929143000); +const PRTime gPreloadListExpirationTime = INT64_C(1407578787593000); class nsSTSPreload { @@ -130,6 +130,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "p.linode.com", false }, { "packagist.org", false }, { "passwd.io", true }, + { "passwordbox.com", false }, { "paste.linode.com", false }, { "pastebin.linode.com", false }, { "pay.gigahost.dk", true },

1 0

[tor-browser/esr24] No bug, Automated HSTS preload list update from host bld-linux64-spot-486 - a=hsts-update
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit cfc4e0103099db4e854f80e2c08e42d012a93a63 Author: ffxbld <none@none> Date: Sat Apr 19 03:13:13 2014 -0700 No bug, Automated HSTS preload list update from host bld-linux64-spot-486 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 13 +++++-------- security/manager/boot/src/nsSTSPreloadList.inc | 13 ++++++++++++- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index cfe99ee..4c1a6eb 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -24,7 +24,7 @@ codereview.chromium.org: did not receive HSTS header crate.io: did not receive HSTS header crowdcurity.com: did not receive HSTS header crypto.is: did not receive HSTS header -csawctf.poly.edu: could not connect to host +csawctf.poly.edu: did not receive HSTS header dl.google.com: did not receive HSTS header docs.google.com: did not receive HSTS header donmez.ws: could not connect to host @@ -71,12 +71,6 @@ nexth.net: did not receive HSTS header nexth.us: could not connect to host openshift.redhat.com: did not receive HSTS header ottospora.nl: could not connect to host -passport.yandex.by: did not receive HSTS header -passport.yandex.com: did not receive HSTS header -passport.yandex.com.tr: did not receive HSTS header -passport.yandex.kz: did not receive HSTS header -passport.yandex.ru: did not receive HSTS header -passport.yandex.ua: did not receive HSTS header paypal.com: max-age too low: 14400 payroll.xero.com: max-age too low: 3600 platform.lookout.com: could not connect to host @@ -85,7 +79,6 @@ prodpad.com: did not receive HSTS header profiles.google.com: did not receive HSTS header rapidresearch.me: did not receive HSTS header sah3.net: could not connect to host -sandbox.mydigipass.com: could not connect to host saturngames.co.uk: did not receive HSTS header script.google.com: did not receive HSTS header security.google.com: did not receive HSTS header @@ -102,6 +95,8 @@ spreadsheets.google.com: did not receive HSTS header square.com: did not receive HSTS header ssl.google-analytics.com: did not receive HSTS header ssl.panoramio.com: did not receive HSTS header +stage.wepay.com: max-age too low: 2592000 +static.wepay.com: did not receive HSTS header sunshinepress.org: could not connect to host surfeasy.com: did not receive HSTS header talk.google.com: did not receive HSTS header @@ -110,6 +105,7 @@ translate.googleapis.com: did not receive HSTS header uprotect.it: could not connect to host wallet.google.com: did not receive HSTS header webmail.mayfirst.org: did not receive HSTS header +wepay.com: max-age too low: 2592000 whonix.org: did not receive HSTS header www.cueup.com: did not receive HSTS header www.developer.mydigipass.com: could not connect to host @@ -129,4 +125,5 @@ www.paypal.com: max-age too low: 14400 www.roddis.net: did not receive HSTS header www.sandbox.mydigipass.com: could not connect to host www.surfeasy.com: did not receive HSTS header +www.wepay.com: max-age too low: 2592000 zoo24.de: max-age too low: 2592000 diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index b547933..e2ecfc3 100644 --- a/security/manager/boot/src/nsSTSPreloadList.inc +++ b/security/manager/boot/src/nsSTSPreloadList.inc @@ -8,7 +8,7 @@ /*****************************************************************************/ #include "mozilla/StandardInteger.h" -const PRTime gPreloadListExpirationTime = INT64_C(1408183539445000); +const PRTime gPreloadListExpirationTime = INT64_C(1408788322005000); class nsSTSPreload { @@ -21,6 +21,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "accounts.google.com", true }, { "aclu.org", false }, { "activiti.alfresco.com", false }, + { "adsfund.org", true }, { "aladdinschools.appspot.com", false }, { "alpha.irccloud.com", false }, { "api.intercom.io", false }, @@ -44,6 +45,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "carezone.com", false }, { "check.torproject.org", false }, { "chromiumcodereview.appspot.com", false }, + { "cloudcert.org", true }, { "cloudns.com.au", true }, { "cloudsecurityalliance.org", true }, { "codereview.appspot.com", false }, @@ -137,6 +139,12 @@ static const nsSTSPreload kSTSPreloadList[] = { { "opsmate.com", false }, { "p.linode.com", false }, { "packagist.org", false }, + { "passport.yandex.by", false }, + { "passport.yandex.com", false }, + { "passport.yandex.com.tr", false }, + { "passport.yandex.kz", false }, + { "passport.yandex.ru", false }, + { "passport.yandex.ua", false }, { "passwd.io", true }, { "passwordbox.com", false }, { "paste.linode.com", false }, @@ -149,6 +157,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "plus.google.com", false }, { "plus.sandbox.google.com", false }, { "publications.qld.gov.au", false }, + { "pult.co", true }, { "pypi.python.org", true }, { "python.org", false }, { "riseup.net", true }, @@ -157,6 +166,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "roundcube.mayfirst.org", false }, { "sandbox.mydigipass.com", false }, { "securityheaders.com", true }, + { "seifried.org", true }, { "semenkovich.com", true }, { "shodan.io", true }, { "silentcircle.com", false }, @@ -174,6 +184,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "torproject.org", false }, { "twitter.com", false }, { "ubertt.org", true }, + { "vmoagents.com", false }, { "webmail.gigahost.dk", false }, { "webmail.onlime.ch", false }, { "wiki.python.org", true },

1 0

[tor-browser/esr24] Backed out changeset 32bb91602986 (bug 995995) for mochitest bustage.
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit c5e8d09fd82fce6198b0e89f107377f69832f25e Author: Ryan VanderMeulen <ryanvm(a)gmail.com> Date: Fri Apr 18 11:39:47 2014 -0400 Backed out changeset 32bb91602986 (bug 995995) for mochitest bustage. --- testing/profiles/prefs_general.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js index 2e5a16f..3032a65 100644 --- a/testing/profiles/prefs_general.js +++ b/testing/profiles/prefs_general.js @@ -141,12 +141,3 @@ user_pref("media.webaudio.legacy.AudioParam", true); user_pref("media.webaudio.legacy.BiquadFilterNode", true); user_pref("media.webaudio.legacy.PannerNode", true); user_pref("media.webaudio.legacy.OscillatorNode", true); - -// Don't connect to Yahoo! for RSS feed tests. -// en-US only uses .types.0.uri, but set all of them just to be sure. -user_pref('browser.contentHandlers.types.0.uri', 'http://test1.example.org/rss?url=%%s') -user_pref('browser.contentHandlers.types.1.uri', 'http://test1.example.org/rss?url=%%s') -user_pref('browser.contentHandlers.types.2.uri', 'http://test1.example.org/rss?url=%%s') -user_pref('browser.contentHandlers.types.3.uri', 'http://test1.example.org/rss?url=%%s') -user_pref('browser.contentHandlers.types.4.uri', 'http://test1.example.org/rss?url=%%s') -user_pref('browser.contentHandlers.types.5.uri', 'http://test1.example.org/rss?url=%%s')

1 0

[tor-browser/esr24] Bug 995995 - Set testing prefs to redirect to the test proxy server for RSS feeds. r=jmaher, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit ff565da2e623662c516976b9a964c3db5fa1bbd2 Author: Nathan Froyd <froydnj(a)mozilla.com> Date: Tue Apr 15 17:14:51 2014 -0400 Bug 995995 - Set testing prefs to redirect to the test proxy server for RSS feeds. r=jmaher, a=test-only --- testing/profiles/prefs_general.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/testing/profiles/prefs_general.js b/testing/profiles/prefs_general.js index 3032a65..2e5a16f 100644 --- a/testing/profiles/prefs_general.js +++ b/testing/profiles/prefs_general.js @@ -141,3 +141,12 @@ user_pref("media.webaudio.legacy.AudioParam", true); user_pref("media.webaudio.legacy.BiquadFilterNode", true); user_pref("media.webaudio.legacy.PannerNode", true); user_pref("media.webaudio.legacy.OscillatorNode", true); + +// Don't connect to Yahoo! for RSS feed tests. +// en-US only uses .types.0.uri, but set all of them just to be sure. +user_pref('browser.contentHandlers.types.0.uri', 'http://test1.example.org/rss?url=%%s') +user_pref('browser.contentHandlers.types.1.uri', 'http://test1.example.org/rss?url=%%s') +user_pref('browser.contentHandlers.types.2.uri', 'http://test1.example.org/rss?url=%%s') +user_pref('browser.contentHandlers.types.3.uri', 'http://test1.example.org/rss?url=%%s') +user_pref('browser.contentHandlers.types.4.uri', 'http://test1.example.org/rss?url=%%s') +user_pref('browser.contentHandlers.types.5.uri', 'http://test1.example.org/rss?url=%%s')

1 0

[tor-browser/esr24] Bug 996031 - Remove 455407.html crashtest. r=dholbert, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit fe8b28b6b5994cee3758a490b24a3d3783c984b8 Author: Nathan Froyd <froydnj(a)mozilla.com> Date: Tue Apr 15 16:31:51 2014 -0400 Bug 996031 - Remove 455407.html crashtest. r=dholbert, a=test-only The bug that this test was intended to test seems transient, according to testing with nightlies around the time the bug was filed. Additionally, the test connects to external servers, which is frowned upon and will soon be forbidden. --- layout/generic/crashtests/455407.html | 13 ------------- layout/generic/crashtests/crashtests.list | 1 - 2 files changed, 14 deletions(-) diff --git a/layout/generic/crashtests/455407.html b/layout/generic/crashtests/455407.html deleted file mode 100644 index 54d389c..0000000 --- a/layout/generic/crashtests/455407.html +++ /dev/null @@ -1,13 +0,0 @@ -<html> -<head>Crash [@ nsSubDocumentFrame::Reflow] with generated content and resizing iframe</title> -</head> -<body> -<iframe id="content" src="data:text/html;charset=utf-8,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody%3E%0A%3Cstyle%20id%3D%22e%22%3Ebody%3A%3Abefore%20%7B%20content%3A%22b%22%3B%20%7D%3C/style%3E%0A%3Cscript%3Ewindow.frameElement.style.width%3DMath.floor%28Math.random%28%29*100%29+%27%25%27%3B%0A%3C/script%3E%0A%3Ciframe%20src%3D%22http%3A//mozilla.org%22%3E%3C/iframe%3E%0A%3C/body%3E%3C/html%3E" onload="//doe()" style=" width:1000px;height: 200px;"></iframe> -<script> -function doe() { - document.getElementById('content').src = document.getElementById('content').src + '?1'; -} -setInterval(doe, 1000); -</script> -</body> -</html> diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list index 54891c8..adaa9d2 100644 --- a/layout/generic/crashtests/crashtests.list +++ b/layout/generic/crashtests/crashtests.list @@ -292,7 +292,6 @@ load 453762-1.html load 455171-1.html load 455171-2.html load 455171-3.html -load 455407.html load 455643-1.xhtml load 457375.html load 457380-1.html

1 0

[tor-browser/esr24] Bug 996019 - Fix browser_bug435325.js to not connect to example.com. r=ehsan, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 4244dc23cc57deb50607119f367eeafbcb446d6e Author: Nathan Froyd <froydnj(a)mozilla.com> Date: Tue Apr 15 16:14:10 2014 -0400 Bug 996019 - Fix browser_bug435325.js to not connect to example.com. r=ehsan, a=test-only --- browser/base/content/test/browser_bug435325.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/browser/base/content/test/browser_bug435325.js b/browser/base/content/test/browser_bug435325.js index 2e9136d..fe05c75 100644 --- a/browser/base/content/test/browser_bug435325.js +++ b/browser/base/content/test/browser_bug435325.js @@ -51,6 +51,11 @@ function checkPage() { // Now press the "Try Again" button ok(gBrowser.contentDocument.getElementById("errorTryAgain"), "The error page has got a #errorTryAgain element"); + + // Re-enable the proxy so example.com is resolved to localhost, rather than + // the actual example.com. + Services.prefs.setIntPref("network.proxy.type", proxyPrefValue); + gBrowser.contentDocument.getElementById("errorTryAgain").click(); ok(!Services.io.offline, "After clicking the Try Again button, we're back " + @@ -60,7 +65,6 @@ function checkPage() { } registerCleanupFunction(function() { - Services.prefs.setIntPref("network.proxy.type", proxyPrefValue); Services.prefs.setBoolPref("browser.cache.disk.enable", true); Services.prefs.setBoolPref("browser.cache.memory.enable", true); Services.io.offline = false;

1 0

[tor-browser/esr24] Bug 992968. r=efaust, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit ef9950875b05a9d4e61954cd28b50db4b2879a84 Author: Nicolas B. Pierron <nicolas.b.pierron(a)mozilla.com> Date: Thu Apr 17 09:48:42 2014 -0400 Bug 992968. r=efaust, a=sledru --- js/src/jit/CodeGenerator.cpp | 3 +++ js/src/jit/shared/CodeGenerator-shared.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp index 534ae07..4fe0327 100644 --- a/js/src/jit/CodeGenerator.cpp +++ b/js/src/jit/CodeGenerator.cpp @@ -91,6 +91,9 @@ class OutOfLineUpdateCache : bool CodeGeneratorShared::addCache(LInstruction *lir, size_t cacheIndex) { + if (cacheIndex == SIZE_MAX) + return false; + IonCache *cache = static_cast<IonCache *>(getCache(cacheIndex)); MInstruction *mir = lir->mirRaw()->toInstruction(); if (mir->resumePoint()) diff --git a/js/src/jit/shared/CodeGenerator-shared.h b/js/src/jit/shared/CodeGenerator-shared.h index 6fdf97a..f0a7c8b 100644 --- a/js/src/jit/shared/CodeGenerator-shared.h +++ b/js/src/jit/shared/CodeGenerator-shared.h @@ -203,6 +203,8 @@ class CodeGeneratorShared : public LInstructionVisitor template <typename T> inline size_t allocateCache(const T &cache) { size_t index = allocateCache(cache, sizeof(mozilla::AlignedStorage2<T>)); + if (masm.oom()) + return SIZE_MAX; // Use the copy constructor on the allocated space. new (&runtimeData_[cacheList_.back()]) T(cache); return index;

1 0

[tor-browser/esr24] Bug 993546 - Refactor malloc-wrapping memory reporter implementations. r=njn, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 2861f1003fbb11e74c901d5bebc7f33be38b5396 Author: Nathan Froyd <froydnj(a)mozilla.com> Date: Tue Apr 15 13:11:59 2014 -0400 Bug 993546 - Refactor malloc-wrapping memory reporter implementations. r=njn, a=abillings --- extensions/spellcheck/hunspell/src/hunspell_alloc_hooks.h | 2 +- gfx/thebes/gfxAndroidPlatform.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/spellcheck/hunspell/src/hunspell_alloc_hooks.h b/extensions/spellcheck/hunspell/src/hunspell_alloc_hooks.h index 8c60074..60b7d33 100644 --- a/extensions/spellcheck/hunspell/src/hunspell_alloc_hooks.h +++ b/extensions/spellcheck/hunspell/src/hunspell_alloc_hooks.h @@ -84,7 +84,7 @@ inline void* hunspell_realloc(void* ptr, size_t size) void* result = moz_realloc(ptr, size); if (result) { HunspellReportMemoryAllocation(result); - } else { + } else if (size != 0) { // realloc failed; undo the HunspellReportMemoryDeallocation from above HunspellReportMemoryAllocation(ptr); } diff --git a/gfx/thebes/gfxAndroidPlatform.cpp b/gfx/thebes/gfxAndroidPlatform.cpp index b220085..b47e171 100644 --- a/gfx/thebes/gfxAndroidPlatform.cpp +++ b/gfx/thebes/gfxAndroidPlatform.cpp @@ -71,7 +71,7 @@ CountingRealloc(FT_Memory memory, long cur_size, long new_size, void* p) void *pnew = realloc(p, new_size); if (pnew) { sFreetypeMemoryUsed += FreetypeMallocSizeOfOnAlloc(pnew); - } else { + } else if (new_size != 0) { // realloc failed; undo the decrement from above sFreetypeMemoryUsed += FreetypeMallocSizeOfOnAlloc(p); }

1 0

[tor-browser/esr24] Bug 892990 - Cap waiting time for wait-for-composite in WebGL reftests. r=bjacob, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 2ca3c2426f1395d3939e767ab53f80e406eb6e24 Author: Jeff Gilbert <jgilbert(a)mozilla.com> Date: Mon Apr 14 15:43:57 2014 -0700 Bug 892990 - Cap waiting time for wait-for-composite in WebGL reftests. r=bjacob, a=test-only --- content/canvas/test/reftest/webgl-clear-test.html | 2 +- content/canvas/test/reftest/webgl-color-alpha-test.html | 2 +- content/canvas/test/reftest/webgl-color-test.html | 2 +- content/canvas/test/reftest/webgl-disable-test.html | 2 +- content/canvas/test/reftest/webgl-hanging-fb-test.html | 2 +- .../canvas/test/reftest/webgl-hanging-scissor-test.html | 2 +- content/canvas/test/reftest/webgl-orientation-test.html | 2 +- content/canvas/test/reftest/webgl-utils.js | 15 +++++++++++++++ 8 files changed, 22 insertions(+), 7 deletions(-) diff --git a/content/canvas/test/reftest/webgl-clear-test.html b/content/canvas/test/reftest/webgl-clear-test.html index 5fe4662..0905dea 100644 --- a/content/canvas/test/reftest/webgl-clear-test.html +++ b/content/canvas/test/reftest/webgl-clear-test.html @@ -33,7 +33,7 @@ function runTest() { else renderBackup(canvas); - rAF(testComplete); + waitForComposite(testComplete); } function testComplete() { diff --git a/content/canvas/test/reftest/webgl-color-alpha-test.html b/content/canvas/test/reftest/webgl-color-alpha-test.html index 9d568ef..45ab06a 100644 --- a/content/canvas/test/reftest/webgl-color-alpha-test.html +++ b/content/canvas/test/reftest/webgl-color-alpha-test.html @@ -85,7 +85,7 @@ function runTest() { else renderBackup(canvas, value, alpha); - rAF(testComplete); + waitForComposite(testComplete); } function testComplete() { diff --git a/content/canvas/test/reftest/webgl-color-test.html b/content/canvas/test/reftest/webgl-color-test.html index 785ef04..5455e49 100644 --- a/content/canvas/test/reftest/webgl-color-test.html +++ b/content/canvas/test/reftest/webgl-color-test.html @@ -69,7 +69,7 @@ function runTest() { else renderBackup(canvas); - rAF(testComplete); + waitForComposite(testComplete); } function testComplete() { diff --git a/content/canvas/test/reftest/webgl-disable-test.html b/content/canvas/test/reftest/webgl-disable-test.html index a46dc75..30581ec 100644 --- a/content/canvas/test/reftest/webgl-disable-test.html +++ b/content/canvas/test/reftest/webgl-disable-test.html @@ -44,7 +44,7 @@ function runTest() { else renderBackup(canvas); - rAF(testComplete); + waitForComposite(testComplete); } function testComplete() { diff --git a/content/canvas/test/reftest/webgl-hanging-fb-test.html b/content/canvas/test/reftest/webgl-hanging-fb-test.html index 4d589c4..e25356f 100644 --- a/content/canvas/test/reftest/webgl-hanging-fb-test.html +++ b/content/canvas/test/reftest/webgl-hanging-fb-test.html @@ -42,7 +42,7 @@ function runTest() { else renderBackup(canvas); - rAF(testComplete); + waitForComposite(testComplete); } function testComplete() { diff --git a/content/canvas/test/reftest/webgl-hanging-scissor-test.html b/content/canvas/test/reftest/webgl-hanging-scissor-test.html index f562447..29d1ecc 100644 --- a/content/canvas/test/reftest/webgl-hanging-scissor-test.html +++ b/content/canvas/test/reftest/webgl-hanging-scissor-test.html @@ -41,7 +41,7 @@ function runTest() { else renderBackup(canvas); - rAF(testComplete); + waitForComposite(testComplete); } function testComplete() { diff --git a/content/canvas/test/reftest/webgl-orientation-test.html b/content/canvas/test/reftest/webgl-orientation-test.html index 9e2ed2e..9fb2019 100644 --- a/content/canvas/test/reftest/webgl-orientation-test.html +++ b/content/canvas/test/reftest/webgl-orientation-test.html @@ -44,7 +44,7 @@ function runTest() { else renderBackup(canvas); - rAF(testComplete); + waitForComposite(testComplete); } function testComplete() { diff --git a/content/canvas/test/reftest/webgl-utils.js b/content/canvas/test/reftest/webgl-utils.js index 72d4b74..c17c8a1 100644 --- a/content/canvas/test/reftest/webgl-utils.js +++ b/content/canvas/test/reftest/webgl-utils.js @@ -66,3 +66,18 @@ function rAF(func) { var raf = window.requestAnimationFrame || window.mozRequestAnimationFrame; raf(func); } + +var MAX_WAIT_FOR_COMPOSITE_DELAY_MS = 500; + +function waitForComposite(func) { + var isDone = false; + var doneFunc = function () { + if (isDone) + return; + isDone = true; + func(); + }; + + rAF(doneFunc); + setTimeout(doneFunc, MAX_WAIT_FOR_COMPOSITE_DELAY_MS); +}

1 0

[tor-browser/esr24] Bug 966630 - Clamp level to TexImage operations to [0..31]. r=jgilbert, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit a869ef10f54cb5e4a0e5d7de293aaff526d5837d Author: Dan Glastonbury <dglastonbury(a)mozilla.com> Date: Wed Apr 16 16:31:53 2014 +1000 Bug 966630 - Clamp level to TexImage operations to [0..31]. r=jgilbert, a=abillings --- content/canvas/src/WebGLContextValidate.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/content/canvas/src/WebGLContextValidate.cpp b/content/canvas/src/WebGLContextValidate.cpp index b364633..46a39d3 100644 --- a/content/canvas/src/WebGLContextValidate.cpp +++ b/content/canvas/src/WebGLContextValidate.cpp @@ -502,6 +502,19 @@ bool WebGLContext::ValidateLevelWidthHeightForTarget(WebGLenum target, WebGLint return false; } + /* Bug 966630: maxTextureSize >> level runs into "undefined" + * behaviour depending on ISA. For example, on Intel shifts + * amounts are mod 64 (in 64-bit mode on 64-bit dest) and mod 32 + * otherwise. This means 16384 >> 0x10000001 == 8192 which isn't + * what would be expected. Make the required behaviour explicit by + * clamping to a shift of 31 bits if level is greater than that + * ammount. This will give 0 that if (!maxAllowedSize) is + * expecting. + */ + + if (level > 31) + level = 31; + WebGLsizei maxAllowedSize = maxTextureSize >> level; if (!maxAllowedSize) { @@ -1023,7 +1036,7 @@ WebGLContext::InitAndValidateGL() default: GenerateWarning("GL error 0x%x occurred during WebGL context initialization!", error); return false; - } + } } }

1 0