tbb-commits August 2014

tbb-commits@lists.torproject.org

3 participants
290 discussions

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

29 Aug '14

commit 76d07341b98cf3d709e83a24e5a82b6bc639316c Author: ffxbld <none@none> Date: Sat Feb 8 03:16:34 2014 -0800 No bug, Automated HSTS preload list update from host bld-linux64-ix-030 - a=hsts-update --- security/manager/boot/src/nsSTSPreloadList.errors | 3 ++- security/manager/boot/src/nsSTSPreloadList.inc | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/security/manager/boot/src/nsSTSPreloadList.errors b/security/manager/boot/src/nsSTSPreloadList.errors index bca0870..2bd6d28 100644 --- a/security/manager/boot/src/nsSTSPreloadList.errors +++ b/security/manager/boot/src/nsSTSPreloadList.errors @@ -8,6 +8,7 @@ bassh.net: did not receive HSTS header bcrook.com: max-age too low: 86400 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 @@ -55,6 +56,7 @@ jottit.com: did not receive HSTS header kiwiirc.com: max-age too low: 5256000 ledgerscope.net: did not receive HSTS header liberty.lavabit.com: could not connect to host +lifeguard.aecom.com: did not receive HSTS header lists.mayfirst.org: did not receive HSTS header mail.google.com: did not receive HSTS header market.android.com: did not receive HSTS header @@ -64,7 +66,6 @@ mydigipass.com: did not receive HSTS header neonisi.com: could not connect to host openshift.redhat.com: did not receive HSTS header ottospora.nl: could not connect to host -packagist.org: max-age too low: 2592000 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 diff --git a/security/manager/boot/src/nsSTSPreloadList.inc b/security/manager/boot/src/nsSTSPreloadList.inc index 312aac3..82fc0af 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(1402139132264000); +const PRTime gPreloadListExpirationTime = INT64_C(1402743927341000); class nsSTSPreload { @@ -34,8 +34,10 @@ static const nsSTSPreload kSTSPreloadList[] = { { "blog.linode.com", false }, { "blog.lookout.com", false }, { "blog.torproject.org", false }, + { "boxcryptor.com", true }, { "bugzilla.mozilla.org", true }, { "business.lookout.com", false }, + { "calyxinstitute.org", false }, { "carezone.com", false }, { "check.torproject.org", false }, { "chromiumcodereview.appspot.com", false }, @@ -86,7 +88,6 @@ static const nsSTSPreload kSTSPreloadList[] = { { "lastpass.com", false }, { "launchkey.com", true }, { "library.linode.com", false }, - { "lifeguard.aecom.com", false }, { "linode.com", false }, { "linx.net", false }, { "lockify.com", true }, @@ -116,9 +117,11 @@ static const nsSTSPreload kSTSPreloadList[] = { { "mykolab.com", true }, { "mylookout.com", false }, { "neg9.org", false }, + { "neilwynne.com", false }, { "oplop.appspot.com", true }, { "opsmate.com", false }, { "p.linode.com", false }, + { "packagist.org", false }, { "passwd.io", true }, { "paste.linode.com", false }, { "pastebin.linode.com", false }, @@ -156,6 +159,7 @@ static const nsSTSPreload kSTSPreloadList[] = { { "writeapp.me", false }, { "www.apollo-auto.com", true }, { "www.braintreepayments.com", false }, + { "www.calyxinstitute.org", false }, { "www.cyveillance.com", true }, { "www.entropia.de", false }, { "www.evernote.com", false },

1 0

[tor-browser/esr24] Bug 966021 - Fix load_truetype_table in the cairo dwrite font backend. r=bas, a=lsblakk
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 52fc03cd74b5f99269698c57a2cc8a5117deaf4c Author: Jonathan Kew <jkew(a)mozilla.com> Date: Sat Feb 1 09:24:58 2014 +0000 Bug 966021 - Fix load_truetype_table in the cairo dwrite font backend. r=bas, a=lsblakk --- gfx/cairo/cairo/src/cairo-dwrite-font.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gfx/cairo/cairo/src/cairo-dwrite-font.cpp b/gfx/cairo/cairo/src/cairo-dwrite-font.cpp index bc97e11..f234421 100644 --- a/gfx/cairo/cairo/src/cairo-dwrite-font.cpp +++ b/gfx/cairo/cairo/src/cairo-dwrite-font.cpp @@ -1052,10 +1052,12 @@ _cairo_dwrite_load_truetype_table(void *scaled_font, return CAIRO_INT_STATUS_UNSUPPORTED; } - *length = size; - if (buffer) { - memcpy(buffer, data, size); + if (buffer && *length && (UINT32)offset < size) { + size = MIN(size - (UINT32)offset, *length); + memcpy(buffer, (const char*)data + offset, size); } + *length = size; + if (tableContext) { face->dwriteface->ReleaseFontTable(tableContext); }

1 0

[tor-browser/esr24] Bug 963198 - Don't mix up byte-size and array-length. r=tn, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 37f96f3d265b9ecb54e86014e57a48f07f202e40 Author: Benoit Jacob <bjacob(a)mozilla.com> Date: Thu Jan 23 17:34:04 2014 -0500 Bug 963198 - Don't mix up byte-size and array-length. r=tn, a=sledru --- layout/mathml/nsMathMLmencloseFrame.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/mathml/nsMathMLmencloseFrame.cpp b/layout/mathml/nsMathMLmencloseFrame.cpp index 8897585..bb7899e 100644 --- a/layout/mathml/nsMathMLmencloseFrame.cpp +++ b/layout/mathml/nsMathMLmencloseFrame.cpp @@ -804,7 +804,7 @@ void nsDisplayNotation::Paint(nsDisplayListBuilder* aBuilder, rect.TopRight() + gfxPoint(std::min(e / 2.0, -w + .4*h), h + .4*w), rect.TopRight() }; - gfxCtx->Polygon(p, sizeof(p)); + gfxCtx->Polygon(p, MOZ_ARRAY_LENGTH(p)); gfxCtx->Fill(); } break;

1 0

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

29 Aug '14

commit 0ce2b0bbace71ad353808dd25e6f7804e4b5af72 Author: ffxbld <none@none> Date: Sat Feb 8 03:09:41 2014 -0800 No bug, Automated blocklist update from host bld-centos6-hp-017 - 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 7f06413..361ea15 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="1391123284000"> +<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1391730565000"> <emItems> <emItem blockID="i454" id="sqlmoz(a)facebook.com"> <versionRange minVersion="0" maxVersion="*" severity="3"> @@ -538,6 +538,12 @@ <prefs> </prefs> </emItem> + <emItem blockID="i550" id="colmer(a)yopmail.com"> + <versionRange minVersion="0" maxVersion="*" severity="3"> + </versionRange> + <prefs> + </prefs> + </emItem> <emItem blockID="i4" id="{4B3803EA-5230-4DC3-A7FC-33638F3D3542}"> <versionRange minVersion="1.2" maxVersion="1.2"> <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">

1 0

[tor-browser/esr24] Bug 966311 - Calculate frame size for stereo wave. r=doublec, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 0109abd08387a67efbda9a4d02c44f1c177efb8c Author: Ralph Giles <giles(a)mozilla.com> Date: Fri Jan 31 13:50:45 2014 -0800 Bug 966311 - Calculate frame size for stereo wave. r=doublec, a=sledru We were assuming 8-bit WAVE files were mono-only, but this is not necessarily the case. --- content/media/wave/WaveReader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/media/wave/WaveReader.cpp b/content/media/wave/WaveReader.cpp index 28aec46..ce71ea6 100644 --- a/content/media/wave/WaveReader.cpp +++ b/content/media/wave/WaveReader.cpp @@ -424,7 +424,7 @@ WaveReader::LoadFormatChunk(uint32_t aChunkSize) // Make sure metadata is fairly sane. The rate check is fairly arbitrary, // but the channels check is intentionally limited to mono or stereo // because that's what the audio backend currently supports. - unsigned int actualFrameSize = sampleFormat == 8 ? 1 : 2 * channels; + unsigned int actualFrameSize = (sampleFormat == 8 ? 1 : 2) * channels; if (rate < 100 || rate > 96000 || channels < 1 || channels > MAX_CHANNELS || (frameSize != 1 && frameSize != 2 && frameSize != 4) ||

1 0

[tor-browser/esr24] Backed out changeset 1f9a3ddde18f (bug 850721) for mochitest-bc timeouts. a=backout
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 56be3872ccf1e66f0bc77ab21c343ede3ea8bf59 Author: Ryan VanderMeulen <ryanvm(a)gmail.com> Date: Sun Feb 9 19:22:58 2014 -0500 Backed out changeset 1f9a3ddde18f (bug 850721) for mochitest-bc timeouts. a=backout DONTBUILD --- browser/base/content/test/social/head.js | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/browser/base/content/test/social/head.js b/browser/base/content/test/social/head.js index 5b77729..1e5d841 100644 --- a/browser/base/content/test/social/head.js +++ b/browser/base/content/test/social/head.js @@ -252,24 +252,14 @@ function updateBlocklist(aCallback) { blocklistNotifier.notify(null); } -var _originalTestBlocklistURL = null; function setAndUpdateBlocklist(aURL, aCallback) { - if (!_originalTestBlocklistURL) - _originalTestBlocklistURL = Services.prefs.getCharPref("extensions.blocklist.url"); Services.prefs.setCharPref("extensions.blocklist.url", aURL); updateBlocklist(aCallback); } function resetBlocklist(aCallback) { - // XXX - this has "forked" from the head.js helpers in our parent directory :( - // But let's reuse their blockNoPlugins.xml. Later, we should arrange to - // use their head.js helpers directly - let noBlockedURL = "http://example.com/browser/browser/base/content/test/general/blockNoPlugins…"; - setAndUpdateBlocklist(noBlockedURL, function() { - Services.prefs.setCharPref("extensions.blocklist.url", _originalTestBlocklistURL); - if (aCallback) - aCallback(); - }); + Services.prefs.clearUserPref("extensions.blocklist.url"); + updateBlocklist(aCallback); } function setManifestPref(name, manifest) {

1 0

[tor-browser/esr24] Bug 968461 - Fix imgStatusTracker.h to build with gcc 4.4. r=jdm, a=sledru
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit db4963336805dbc8609691d3fe4e77960b8cb4e3 Author: Mike Hommey <mh(a)glandium.org> Date: Thu Feb 6 07:07:18 2014 +0900 Bug 968461 - Fix imgStatusTracker.h to build with gcc 4.4. r=jdm, a=sledru --- image/src/imgStatusTracker.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/src/imgStatusTracker.h b/image/src/imgStatusTracker.h index d3f36b3..b19b239 100644 --- a/image/src/imgStatusTracker.h +++ b/image/src/imgStatusTracker.h @@ -212,7 +212,7 @@ public: nsIntRect GetInvalidRect() const { return mInvalidRect; } - typedef nsTObserverArray<mozilla::WeakPtr<imgRequestProxy>> ProxyArray; + typedef nsTObserverArray<mozilla::WeakPtr<imgRequestProxy> > ProxyArray; private: friend class imgStatusNotifyRunnable; friend class imgRequestNotifyRunnable;

1 0

[tor-browser/esr24] Bug 850721 - Fix social blocklist oranges by not enabling the default update server. r=mixedpuppy, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 4fd7f4e3c1226049e4815d1cc01a5a99a473c121 Author: Mark Hammond <mhammond(a)skippinet.com.au> Date: Fri Feb 7 12:07:04 2014 +1100 Bug 850721 - Fix social blocklist oranges by not enabling the default update server. r=mixedpuppy, a=test-only --- browser/base/content/test/social/head.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/browser/base/content/test/social/head.js b/browser/base/content/test/social/head.js index 1e5d841..5b77729 100644 --- a/browser/base/content/test/social/head.js +++ b/browser/base/content/test/social/head.js @@ -252,14 +252,24 @@ function updateBlocklist(aCallback) { blocklistNotifier.notify(null); } +var _originalTestBlocklistURL = null; function setAndUpdateBlocklist(aURL, aCallback) { + if (!_originalTestBlocklistURL) + _originalTestBlocklistURL = Services.prefs.getCharPref("extensions.blocklist.url"); Services.prefs.setCharPref("extensions.blocklist.url", aURL); updateBlocklist(aCallback); } function resetBlocklist(aCallback) { - Services.prefs.clearUserPref("extensions.blocklist.url"); - updateBlocklist(aCallback); + // XXX - this has "forked" from the head.js helpers in our parent directory :( + // But let's reuse their blockNoPlugins.xml. Later, we should arrange to + // use their head.js helpers directly + let noBlockedURL = "http://example.com/browser/browser/base/content/test/general/blockNoPlugins…"; + setAndUpdateBlocklist(noBlockedURL, function() { + Services.prefs.setCharPref("extensions.blocklist.url", _originalTestBlocklistURL); + if (aCallback) + aCallback(); + }); } function setManifestPref(name, manifest) {

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] fixup! Backport two integer overflow patches.
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit b19c32010424180d9e524503c90eb05344d39bd0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Aug 28 18:30:06 2014 -0700 fixup! Backport two integer overflow patches. These are in the mozilla namespace. --- image/src/imgFrame.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/src/imgFrame.cpp b/image/src/imgFrame.cpp index 33d1b3a..0e2ef3f 100644 --- a/image/src/imgFrame.cpp +++ b/image/src/imgFrame.cpp @@ -55,7 +55,7 @@ static bool AllowedImageSize(int32_t aWidth, int32_t aHeight) } // check to make sure we don't overflow a 32-bit - CheckedInt32 requiredBytes = CheckedInt32(aWidth) * CheckedInt32(aHeight) * 4; + mozilla::CheckedInt32 requiredBytes = mozilla::CheckedInt32(aWidth) * mozilla::CheckedInt32(aHeight) * 4; if (MOZ_UNLIKELY(!requiredBytes.isValid())) { NS_WARNING("width or height too large"); return false;

1 0

[tor-browser/tor-browser-24.7.0esr-4.x-2] Backport two integer overflow patches.
by mikeperry＠torproject.org 28 Aug '14

28 Aug '14

commit b1f011d993b4a00db2cb50c49dea38ec5188fdb0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Aug 28 16:04:57 2014 -0700 Backport two integer overflow patches. https://hg.mozilla.org/mozilla-central/rev/14ad832ecbcd https://hg.mozilla.org/mozilla-central/rev/c00387255d25 https://bugzilla.mozilla.org/show_bug.cgi?id=922603 https://bugzilla.mozilla.org/show_bug.cgi?id=811122 --- image/src/imgFrame.cpp | 10 +++------- js/src/vm/Interpreter-inl.h | 8 ++------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/image/src/imgFrame.cpp b/image/src/imgFrame.cpp index c1b4022..33d1b3a 100644 --- a/image/src/imgFrame.cpp +++ b/image/src/imgFrame.cpp @@ -19,6 +19,7 @@ static bool gDisableOptimize = false; #include "cairo.h" #include "GeckoProfiler.h" #include "mozilla/Likely.h" +#include "mozilla/CheckedInt.h" #if defined(XP_WIN) @@ -54,13 +55,8 @@ static bool AllowedImageSize(int32_t aWidth, int32_t aHeight) } // check to make sure we don't overflow a 32-bit - int32_t tmp = aWidth * aHeight; - if (MOZ_UNLIKELY(tmp / aHeight != aWidth)) { - NS_WARNING("width or height too large"); - return false; - } - tmp = tmp * 4; - if (MOZ_UNLIKELY(tmp / 4 != aWidth * aHeight)) { + CheckedInt32 requiredBytes = CheckedInt32(aWidth) * CheckedInt32(aHeight) * 4; + if (MOZ_UNLIKELY(!requiredBytes.isValid())) { NS_WARNING("width or height too large"); return false; } diff --git a/js/src/vm/Interpreter-inl.h b/js/src/vm/Interpreter-inl.h index b5818e4..0a665d1 100644 --- a/js/src/vm/Interpreter-inl.h +++ b/js/src/vm/Interpreter-inl.h @@ -368,13 +368,9 @@ AddOperation(JSContext *cx, HandleScript script, jsbytecode *pc, { if (lhs.isInt32() && rhs.isInt32()) { int32_t l = lhs.toInt32(), r = rhs.toInt32(); - int32_t sum = l + r; - if (JS_UNLIKELY(bool((l ^ sum) & (r ^ sum) & 0x80000000))) { - res->setDouble(double(l) + double(r)); + double d = double(l) + double(r); + if (!res->setNumber(d)) types::TypeScript::MonitorOverflow(cx, script, pc); - } else { - res->setInt32(sum); - } return true; }

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits August 2014