- tbb-commits - lists.torproject.org

[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 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] 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] 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

[tor-browser/esr24] Bug 957666 - Send back a huge retry reconnection time in delayedServerEvents.sjs. r=ehsan, a=test-only
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 277eb9ffa868359c16f3fd7a27bdaa67418cac7f Author: Olli Pettay <Olli.Pettay(a)helsinki.fi> Date: Wed Apr 16 20:56:20 2014 -0400 Bug 957666 - Send back a huge retry reconnection time in delayedServerEvents.sjs. r=ehsan, a=test-only --- content/base/test/delayedServerEvents.sjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/base/test/delayedServerEvents.sjs b/content/base/test/delayedServerEvents.sjs index 9491af2..c2d2f5d 100644 --- a/content/base/test/delayedServerEvents.sjs +++ b/content/base/test/delayedServerEvents.sjs @@ -1,7 +1,7 @@ // this will take strings_to_send.length*500 ms = 5 sec var timer = null; -var strings_to_send = ["data\r\n\nda", "ta", ":", "de", "layed1\n\n", +var strings_to_send = ["retry:999999999\ndata\r\n\nda", "ta", ":", "de", "layed1\n\n", "", "", "data:delayed2\n\n", "", ""];

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 991471 - Fix offset when setting host on URL. r=mcmanus, a=abillings
by mikeperry＠torproject.org 29 Aug '14

29 Aug '14

commit 6f92a1feadf46e50286dfed67835e92038196dc2 Author: Valentin Gosu <valentin.gosu(a)gmail.com> Date: Thu Apr 10 10:23:04 2014 -0400 Bug 991471 - Fix offset when setting host on URL. r=mcmanus, a=abillings --- netwerk/base/src/nsStandardURL.cpp | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/netwerk/base/src/nsStandardURL.cpp b/netwerk/base/src/nsStandardURL.cpp index 2216580..d97718a 100644 --- a/netwerk/base/src/nsStandardURL.cpp +++ b/netwerk/base/src/nsStandardURL.cpp @@ -1476,7 +1476,14 @@ nsStandardURL::SetHost(const nsACString &input) len = flat.Length(); if (mHost.mLen < 0) { - mHost.mPos = mAuthority.mPos; + int port_length = 0; + if (mPort != -1) { + nsAutoCString buf; + buf.Assign(':'); + buf.AppendInt(mPort); + port_length = buf.Length(); + } + mHost.mPos = mAuthority.mPos + mAuthority.mLen - port_length; mHost.mLen = 0; } @@ -1520,7 +1527,7 @@ nsStandardURL::SetPort(int32_t port) nsAutoCString buf; buf.Assign(':'); buf.AppendInt(port); - mSpec.Insert(buf, mHost.mPos + mHost.mLen); + mSpec.Insert(buf, mAuthority.mPos + mAuthority.mLen); mAuthority.mLen += buf.Length(); ShiftFromPath(buf.Length()); } @@ -1528,9 +1535,14 @@ nsStandardURL::SetPort(int32_t port) // Don't allow mPort == mDefaultPort port = -1; + // compute length of the current port + nsAutoCString buf; + buf.Assign(':'); + buf.AppendInt(mPort); + // need to remove the port number from the URL spec - uint32_t start = mHost.mPos + mHost.mLen; - int32_t lengthToCut = mPath.mPos - start; + uint32_t start = mAuthority.mPos + mAuthority.mLen - buf.Length(); + int32_t lengthToCut = buf.Length(); mSpec.Cut(start, lengthToCut); mAuthority.mLen -= lengthToCut; ShiftFromPath(-lengthToCut); @@ -1538,9 +1550,13 @@ nsStandardURL::SetPort(int32_t port) else { // need to replace the existing port nsAutoCString buf; + buf.Assign(':'); + buf.AppendInt(mPort); + uint32_t start = mAuthority.mPos + mAuthority.mLen - buf.Length(); + uint32_t length = buf.Length(); + + buf.Assign(':'); buf.AppendInt(port); - uint32_t start = mHost.mPos + mHost.mLen + 1; - uint32_t length = mPath.mPos - start; mSpec.Replace(start, length, buf); if (buf.Length() != length) { mAuthority.mLen += buf.Length() - length;

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 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