Merge pull request #326 from atvise/fixed_variable_length_arrays

Fixed VLA definition because not every compiler supports that
CopernicaMarketingSoftware · Nov 24, 2023 · d778788 · d778788
2 parents d2dc9b7 + 1630d96
commit d778788
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/zend/parametersimpl.h b/zend/parametersimpl.h
@@ -29,7 +29,7 @@ class ParametersImpl : public Parameters
         reserve(argc);
 
         // array to store all the arguments in
-        zval arguments[argc];
+        zval* arguments = static_cast<zval*>(alloca(argc * sizeof(zval)));
 
         // retrieve the arguments
         zend_get_parameters_array_ex(argc, arguments);

diff --git a/zend/value.cpp b/zend/value.cpp
@@ -903,7 +903,7 @@ Value Value::call(const char *name)
 Value Value::exec(int argc, Value *argv) const
 {
     // array of zvals to execute
-    zval params[argc];
+    zval* params = static_cast<zval*>(alloca(argc * sizeof(zval)));
 
     // convert all the values
     for(int i = 0; i < argc; i++) { params[i] = *argv[i]._val; }
@@ -925,7 +925,7 @@ Value Value::exec(const char *name, int argc, Value *argv) const
     Value method(name);
 
     // array of zvals to execute
-    zval params[argc];
+    zval* params = static_cast<zval*>(alloca(argc * sizeof(zval)));
 
     // convert all the values
     for(int i = 0; i < argc; i++) { params[i] = *argv[i]._val; }
@@ -947,7 +947,7 @@ Value Value::exec(const char *name, int argc, Value *argv)
     Value method(name);
 
     // array of zvals to execute
-    zval params[argc];
+    zval* params = static_cast<zval*>(alloca(argc * sizeof(zval)));
 
     // convert all the values
     for(int i = 0; i < argc; i++) { params[i] = *argv[i]._val; }