3623424b10
https://www.mozilla.org/en-US/firefox/128.0/releasenotes MFSA 2024-29 (bsc#1226316) * CVE-2024-6605 (bmo#1836786) Firefox Android missed activation delay to prevent tapjacking * CVE-2024-6606 (bmo#1902305) Out-of-bounds read in clipboard component * CVE-2024-6607 (bmo#1694513) Leaving pointerlock by pressing the escape key could be prevented * CVE-2024-6608 (bmo#1743329) Cursor could be moved out of the viewport using pointerlock. * CVE-2024-6609 (bmo#1839258) Memory corruption in NSS * CVE-2024-6610 (bmo#1883396) Form validation popups could block exiting full-screen mode * CVE-2024-6600 (bmo#1888340) Memory corruption in WebGL API * CVE-2024-6601 (bmo#1890748) Race condition in permission assignment * CVE-2024-6602 (bmo#1895032) Memory corruption in NSS * CVE-2024-6603 (bmo#1895081) Memory corruption in thread creation * CVE-2024-6611 (bmo#1844827) Incorrect handling of SameSite cookies * CVE-2024-6612 (bmo#1880374) CSP violation leakage when using devtools * CVE-2024-6613 (bmo#1900523) Incorrect listing of stack frames OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=1162
130 lines
4.0 KiB
Diff
130 lines
4.0 KiB
Diff
# HG changeset patch
|
|
# Parent 125a78208d2cef58191a0328ffe894dd14c6b146
|
|
Taken from https://bugzilla.mozilla.org/show_bug.cgi?id=1504834
|
|
|
|
diff --git a/gfx/2d/DrawTargetSkia.cpp b/gfx/2d/DrawTargetSkia.cpp
|
|
--- a/gfx/2d/DrawTargetSkia.cpp
|
|
+++ b/gfx/2d/DrawTargetSkia.cpp
|
|
@@ -151,17 +151,18 @@ static IntRect CalculateSurfaceBounds(co
|
|
if (!sampledBounds.ToIntRect(&bounds)) {
|
|
return surfaceBounds;
|
|
}
|
|
|
|
return surfaceBounds.Intersect(bounds);
|
|
}
|
|
|
|
static const int kARGBAlphaOffset =
|
|
- SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
|
|
+ 0; // Skia is always BGRA SurfaceFormat::A8R8G8B8_UINT32 ==
|
|
+ // SurfaceFormat::B8G8R8A8 ? 3 : 0;
|
|
|
|
static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
|
|
const int32_t aStride, SurfaceFormat aFormat) {
|
|
if (aFormat != SurfaceFormat::B8G8R8X8 || aSize.IsEmpty()) {
|
|
return true;
|
|
}
|
|
// We should've initialized the data to be opaque already
|
|
// On debug builds, verify that this is actually true.
|
|
diff --git a/gfx/2d/Types.h b/gfx/2d/Types.h
|
|
--- a/gfx/2d/Types.h
|
|
+++ b/gfx/2d/Types.h
|
|
@@ -84,28 +84,21 @@ enum class SurfaceFormat : int8_t {
|
|
YUV422, // Single plane YUV 4:2:2 interleaved as Y`0 Cb Y`1 Cr.
|
|
HSV,
|
|
Lab,
|
|
Depth,
|
|
|
|
// This represents the unknown format.
|
|
UNKNOWN, // TODO: Replace uses with Maybe<SurfaceFormat>.
|
|
|
|
-// The following values are endian-independent synonyms. The _UINT32 suffix
|
|
-// indicates that the name reflects the layout when viewed as a uint32_t
|
|
-// value.
|
|
-#if MOZ_LITTLE_ENDIAN()
|
|
+ // The following values are endian-independent synonyms. The _UINT32 suffix
|
|
+ // indicates that the name reflects the layout when viewed as a uint32_t
|
|
+ // value.
|
|
A8R8G8B8_UINT32 = B8G8R8A8, // 0xAARRGGBB
|
|
X8R8G8B8_UINT32 = B8G8R8X8, // 0x00RRGGBB
|
|
-#elif MOZ_BIG_ENDIAN()
|
|
- A8R8G8B8_UINT32 = A8R8G8B8, // 0xAARRGGBB
|
|
- X8R8G8B8_UINT32 = X8R8G8B8, // 0x00RRGGBB
|
|
-#else
|
|
-# error "bad endianness"
|
|
-#endif
|
|
|
|
// The following values are OS and endian-independent synonyms.
|
|
//
|
|
// TODO(aosmond): When everything blocking bug 1581828 has been resolved, we
|
|
// can make this use R8B8G8A8 and R8B8G8X8 for non-Windows platforms.
|
|
OS_RGBA = A8R8G8B8_UINT32,
|
|
OS_RGBX = X8R8G8B8_UINT32
|
|
};
|
|
diff --git a/gfx/skia/skia/modules/skcms/skcms.cc b/gfx/skia/skia/modules/skcms/skcms.cc
|
|
--- a/gfx/skia/skia/modules/skcms/skcms.cc
|
|
+++ b/gfx/skia/skia/modules/skcms/skcms.cc
|
|
@@ -26,16 +26,18 @@
|
|
// it'd be a lot slower. But we want all those headers included so we
|
|
// can use their features after runtime checks later.
|
|
#include <smmintrin.h>
|
|
#include <avxintrin.h>
|
|
#include <avx2intrin.h>
|
|
#include <avx512fintrin.h>
|
|
#include <avx512dqintrin.h>
|
|
#endif
|
|
+#else
|
|
+ #define SKCMS_PORTABLE
|
|
#endif
|
|
|
|
using namespace skcms_private;
|
|
|
|
static bool sAllowRuntimeCPUDetection = true;
|
|
|
|
void skcms_DisableRuntimeCPUDetection() {
|
|
sAllowRuntimeCPUDetection = false;
|
|
@@ -319,30 +321,38 @@ enum {
|
|
skcms_Signature_sf32 = 0x73663332,
|
|
// XYZ is also a PCS signature, so it's defined in skcms.h
|
|
// skcms_Signature_XYZ = 0x58595A20,
|
|
};
|
|
|
|
static uint16_t read_big_u16(const uint8_t* ptr) {
|
|
uint16_t be;
|
|
memcpy(&be, ptr, sizeof(be));
|
|
-#if defined(_MSC_VER)
|
|
- return _byteswap_ushort(be);
|
|
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
|
|
+ return be;
|
|
#else
|
|
- return __builtin_bswap16(be);
|
|
+ #if defined(_MSC_VER)
|
|
+ return _byteswap_ushort(be);
|
|
+ #else
|
|
+ return __builtin_bswap16(be);
|
|
+ #endif
|
|
#endif
|
|
}
|
|
|
|
static uint32_t read_big_u32(const uint8_t* ptr) {
|
|
uint32_t be;
|
|
memcpy(&be, ptr, sizeof(be));
|
|
-#if defined(_MSC_VER)
|
|
- return _byteswap_ulong(be);
|
|
+#if __BYTE_ORDER == __ORDER_BIG_ENDIAN__
|
|
+ return be;
|
|
#else
|
|
- return __builtin_bswap32(be);
|
|
+ #if defined(_MSC_VER)
|
|
+ return _byteswap_ulong(be);
|
|
+ #else
|
|
+ return __builtin_bswap32(be);
|
|
+ #endif
|
|
#endif
|
|
}
|
|
|
|
static int32_t read_big_i32(const uint8_t* ptr) {
|
|
return (int32_t)read_big_u32(ptr);
|
|
}
|
|
|
|
static float read_big_fixed(const uint8_t* ptr) {
|