Revert "Avoid partial munmap memory leak" (#1195)

Reverts #1189 Unfortunately, the current implementation triggers "memory access out of bounds" errors in places they weren't happening before. See #1194 for more context.
WordPress · Apr 4, 2024 · a30405b · a30405b
1 parent a678c93
commit a30405b
Show file tree

Hide file tree

Showing 63 changed files with 27 additions and 379 deletions.
diff --git a/packages/php-wasm/compile/php-wasm-memory-storage/.gitignore b/packages/php-wasm/compile/php-wasm-memory-storage/.gitignore
diff --git a/packages/php-wasm/compile/php-wasm-memory-storage/config.m4 b/packages/php-wasm/compile/php-wasm-memory-storage/config.m4
diff --git a/packages/php-wasm/compile/php-wasm-memory-storage/config.w32 b/packages/php-wasm/compile/php-wasm-memory-storage/config.w32
diff --git a/packages/php-wasm/compile/php-wasm-memory-storage/php_wasm_memory_storage.h b/packages/php-wasm/compile/php-wasm-memory-storage/php_wasm_memory_storage.h
diff --git a/packages/php-wasm/compile/php-wasm-memory-storage/wasm_memory_storage.c b/packages/php-wasm/compile/php-wasm-memory-storage/wasm_memory_storage.c
diff --git a/packages/php-wasm/compile/php/Dockerfile b/packages/php-wasm/compile/php/Dockerfile
@@ -14,9 +14,6 @@ RUN git clone https://github.com/php/php-src.git php-src \
 	--single-branch          \
 	--depth 1;
 
-# Work around memory leak due to PHP using Emscripten's incomplete mmap/munmap support
-COPY ./php-wasm-memory-storage /root/php-src/ext/wasm_memory_storage
-
 RUN cd php-src && ./buildconf --force
 
 # Bring in the libraries
@@ -217,10 +214,6 @@ RUN if [ "$WITH_MBREGEX" = "yes" ] && [ "${PHP_VERSION:0:3}" != "7.0" ]; \
 COPY ./php/php*.patch /root/
 RUN cd /root && \
 	git apply --no-index /root/php${PHP_VERSION:0:3}*.patch -v && \
-	( [[ "${PHP_VERSION:0:3}" == '8.3' ]] && \
-		git apply --no-index /root/php-chunk-alloc-zend-assert-8.3.patch -v || \
-		git apply --no-index /root/php-chunk-alloc-zend-assert.patch -v \
-	) && \
 	touch php-src/patched
 
 # Add VRZNO if needed
@@ -277,7 +270,6 @@ RUN source /root/emsdk/emsdk_env.sh && \
 	--enable-bcmath    \
 	--enable-ctype     \
 	--enable-tokenizer \
-	--enable-wasm_memory_storage \
 	$(cat /root/.php-configure-flags)
 
 # Silence the errors "munmap() failed: [28] Invalid argument"

diff --git a/packages/php-wasm/compile/php/php-chunk-alloc-zend-assert-8.3.patch b/packages/php-wasm/compile/php/php-chunk-alloc-zend-assert-8.3.patch
diff --git a/packages/php-wasm/compile/php/php-chunk-alloc-zend-assert.patch b/packages/php-wasm/compile/php/php-chunk-alloc-zend-assert.patch
diff --git a/packages/php-wasm/node/public/7_0_33/php_7_0.wasm b/packages/php-wasm/node/public/7_0_33/php_7_0.wasm
diff --git a/packages/php-wasm/node/public/7_1_30/php_7_1.wasm b/packages/php-wasm/node/public/7_1_30/php_7_1.wasm
diff --git a/packages/php-wasm/node/public/7_2_34/php_7_2.wasm b/packages/php-wasm/node/public/7_2_34/php_7_2.wasm
diff --git a/packages/php-wasm/node/public/7_3_33/php_7_3.wasm b/packages/php-wasm/node/public/7_3_33/php_7_3.wasm
diff --git a/packages/php-wasm/node/public/7_4_33/php_7_4.wasm b/packages/php-wasm/node/public/7_4_33/php_7_4.wasm
diff --git a/packages/php-wasm/node/public/8_0_30/php_8_0.wasm b/packages/php-wasm/node/public/8_0_30/php_8_0.wasm
diff --git a/packages/php-wasm/node/public/8_1_23/php_8_1.wasm b/packages/php-wasm/node/public/8_1_23/php_8_1.wasm
diff --git a/packages/php-wasm/node/public/8_2_10/php_8_2.wasm b/packages/php-wasm/node/public/8_2_10/php_8_2.wasm
diff --git a/packages/php-wasm/node/public/8_3_0/php_8_3.wasm b/packages/php-wasm/node/public/8_3_0/php_8_3.wasm
diff --git a/packages/php-wasm/node/public/php_7_0.js b/packages/php-wasm/node/public/php_7_0.js
@@ -1,6 +1,6 @@
 const dependencyFilename = __dirname + '/7_0_33/php_7_0.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 12779191; 
+export const dependenciesTotalSize = 12778149; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

diff --git a/packages/php-wasm/node/public/php_7_1.js b/packages/php-wasm/node/public/php_7_1.js
@@ -1,6 +1,6 @@
 const dependencyFilename = __dirname + '/7_1_30/php_7_1.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 13301166; 
+export const dependenciesTotalSize = 13300133; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

diff --git a/packages/php-wasm/node/public/php_7_2.js b/packages/php-wasm/node/public/php_7_2.js
@@ -1,6 +1,6 @@
 const dependencyFilename = __dirname + '/7_2_34/php_7_2.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 13991791; 
+export const dependenciesTotalSize = 13991154; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

diff --git a/packages/php-wasm/node/public/php_7_3.js b/packages/php-wasm/node/public/php_7_3.js
@@ -1,6 +1,6 @@
 const dependencyFilename = __dirname + '/7_3_33/php_7_3.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 14098602; 
+export const dependenciesTotalSize = 14097593; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

diff --git a/packages/php-wasm/node/public/php_7_4.js b/packages/php-wasm/node/public/php_7_4.js
@@ -1,6 +1,6 @@
 const dependencyFilename = __dirname + '/7_4_33/php_7_4.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 14331003; 
+export const dependenciesTotalSize = 14330034; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets

diff --git a/packages/php-wasm/node/public/php_8_0.js b/packages/php-wasm/node/public/php_8_0.js
@@ -1,6 +1,6 @@
 const dependencyFilename = __dirname + '/8_0_30/php_8_0.wasm'; 
 export { dependencyFilename }; 
-export const dependenciesTotalSize = 13597807; 
+export const dependenciesTotalSize = 13597144; 
 export function init(RuntimeName, PHPLoader) {
     /**
      * Overrides Emscripten's default ExitStatus object which gets