From b139b27679e877bf15bf3c479c509083873b2cd5 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Tue, 28 Feb 2017 04:32:28 +0000 Subject: www/firefox: update to 52.0 (rc1) More candidates are likely to come before the official announcement (aka the rush hour) scheduled on 2017-03-07. This one intended to pick up upstream security fixes earlier while looking for downstream regressions. Changes: https://www.mozilla.org/firefox/52.0/releasenotes/ Security: 96eca031-1313-4daf-9be2-9d6e1c4f1eb5 MFH: 2017Q1 (piling up, requires r431637 + r434531) --- www/firefox/files/patch-bug757366 | 58 --------------------------------------- 1 file changed, 58 deletions(-) delete mode 100644 www/firefox/files/patch-bug757366 (limited to 'www/firefox/files/patch-bug757366') diff --git a/www/firefox/files/patch-bug757366 b/www/firefox/files/patch-bug757366 deleted file mode 100644 index 20be9013276d..000000000000 --- a/www/firefox/files/patch-bug757366 +++ /dev/null @@ -1,58 +0,0 @@ -commit 2a3be4b384b9 -Author: Jonathan Kew -Date: Mon Sep 26 18:05:14 2016 +0100 - - Bug 757366 - Don't cast pointers to 'name'-table data to uint16_t*, as they may not be 16-bit-aligned. r=jrmuizel ---- - gfx/thebes/gfxFontUtils.cpp | 26 ++++++++++++++------------ - 1 file changed, 14 insertions(+), 12 deletions(-) - -diff --git gfx/thebes/gfxFontUtils.cpp gfx/thebes/gfxFontUtils.cpp -index 526e17d..cb505e8 100644 ---- gfx/thebes/gfxFontUtils.cpp -+++ gfx/thebes/gfxFontUtils.cpp -@@ -918,16 +918,18 @@ IsValidSFNTVersion(uint32_t version) - version == TRUETYPE_TAG('t','r','u','e'); - } - --// copy and swap UTF-16 values, assume no surrogate pairs, can be in place -+// Copy and swap UTF-16 values, assume no surrogate pairs, can be in place. -+// aInBuf and aOutBuf are NOT necessarily 16-bit-aligned, so we should avoid -+// accessing them directly as uint16_t* values. -+// aLen is count of UTF-16 values, so the byte buffers are twice that. - static void --CopySwapUTF16(const uint16_t *aInBuf, uint16_t *aOutBuf, uint32_t aLen) -+CopySwapUTF16(const char* aInBuf, char* aOutBuf, uint32_t aLen) - { -- const uint16_t *end = aInBuf + aLen; -+ const char* end = aInBuf + aLen * 2; - while (aInBuf < end) { -- uint16_t value = *aInBuf; -- *aOutBuf = (value >> 8) | (value & 0xff) << 8; -- aOutBuf++; -- aInBuf++; -+ uint8_t b0 = *aInBuf++; -+ *aOutBuf++ = *aInBuf++; -+ *aOutBuf++ = b0; - } - } - -@@ -1446,13 +1448,13 @@ gfxFontUtils::DecodeFontName(const char *aNameData, int32_t aByteLen, - if (csName[0] == 0) { - // empty charset name: data is utf16be, no need to instantiate a converter - uint32_t strLen = aByteLen / 2; --#ifdef IS_LITTLE_ENDIAN - aName.SetLength(strLen); -- CopySwapUTF16(reinterpret_cast(aNameData), -- reinterpret_cast(aName.BeginWriting()), strLen); -+#ifdef IS_LITTLE_ENDIAN -+ CopySwapUTF16(aNameData, reinterpret_cast(aName.BeginWriting()), -+ strLen); - #else -- aName.Assign(reinterpret_cast(aNameData), strLen); --#endif -+ memcpy(aName.BeginWriting(), aNameData, strLen * 2); -+#endif - return true; - } - -- cgit v1.2.3