summaryrefslogtreecommitdiffstats
path: root/sandbox-php74.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-09-06 11:07:12 +0200
committerRemi Collet <remi@remirepo.net>2019-09-06 11:07:12 +0200
commit0760fb4b704d44965fe213fa33e4a66372b6c460 (patch)
treebc51722ead978eb0b01f500b14eaa13517e1d924 /sandbox-php74.patch
parentcee85b425836a4b2a4184ce326194cc0ec7601aa (diff)
add suptream patch for 7.4.0RC1
Diffstat (limited to 'sandbox-php74.patch')
-rw-r--r--sandbox-php74.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/sandbox-php74.patch b/sandbox-php74.patch
new file mode 100644
index 0000000..323381b
--- /dev/null
+++ b/sandbox-php74.patch
@@ -0,0 +1,23 @@
+From c4b8428acca58387d80698d3428a53148ac72a7e Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Fri, 6 Sep 2019 11:04:22 +0200
+Subject: [PATCH] fix for 7.4
+
+---
+ src/copy.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/copy.c b/src/copy.c
+index c0af965..e2f959b 100644
+--- a/src/copy.c
++++ b/src/copy.c
+@@ -223,7 +223,9 @@ static inline zend_op* php_sandbox_copy_opcodes(zend_op_array *op_array, zval *l
+ case ZEND_JMP:
+ case ZEND_FAST_CALL:
+ case ZEND_DECLARE_ANON_CLASS:
++#if PHP_VERSION_ID < 70400
+ case ZEND_DECLARE_ANON_INHERITED_CLASS:
++#endif
+ opline->op1.jmp_addr = &copy[opline->op1.jmp_addr - op_array->opcodes];
+ break;
+