firefox: avoid using the highest byte of pointer

termux · Jan 13, 2025 · dda7002 · dda7002
1 parent cafab99
commit dda7002
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/x11-packages/firefox/0029-fix-tagged-pointer.patch b/x11-packages/firefox/0029-fix-tagged-pointer.patch
@@ -0,0 +1,17 @@
+https://github.com/termux/termux-packages/issues/22907
+
+--- a/layout/generic/IntrinsicISizesCache.h
++++ b/layout/generic/IntrinsicISizesCache.h
+@@ -142,7 +142,12 @@
+   };
+
+   static constexpr uintptr_t kHighBit = uintptr_t(1)
++// The first byte of pointer is reserved since Android 11.
++#if defined(HAVE_64BIT_BUILD) && defined(__TERMUX__)
++                                        << (sizeof(void*) * CHAR_BIT - 1 - CHAR_BIT);
++#else
+                                         << (sizeof(void*) * CHAR_BIT - 1);
++#endif
+
+   bool IsOutOfLine() const {
+ #ifdef HAVE_64BIT_BUILD
diff --git a/x11-packages/firefox/build.sh b/x11-packages/firefox/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Mozilla Firefox web browser"
 TERMUX_PKG_LICENSE="MPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="134.0"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://archive.mozilla.org/pub/firefox/releases/${TERMUX_PKG_VERSION}/source/firefox-${TERMUX_PKG_VERSION}.source.tar.xz
 TERMUX_PKG_SHA256=ca88068bd72784c10de16df62359b2dc354672a1a427b4fd6a5fcdb34c06457e
 # ffmpeg and pulseaudio are dependencies through dlopen(3):