Fix #78694: Appending to a variant array causes segfault

`write_dimension` object handlers have to be able to handle `NULL`
`offset`s; for now we simply throw an exception instead of following
the `NULL` pointer.

diff --git a/NEWS b/NEWS
index 2028649849bfbcf55d9504560e30e640b73bf1c5..d63dd99d6edd225c191ae4ef108a83438fccadb1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,9 @@ PHP                                                                        NEWS
   . Fixed bug #78656 (Parse errors classified as highest log-level). (Erik
     Lundin)
 
+- COM:
+  . Fixed bug #78694 (Appending to a variant array causes segfault). (cmb)
+
 - Date:
   . Fixed bug #70153 (\DateInterval incorrectly unserialized). (Maksim Iakunin)
 

diff --git a/ext/com_dotnet/com_handlers.c b/ext/com_dotnet/com_handlers.c
index 1fc6c04c9a062c90a18b99d8c1153be05cffe538..e7b0aa4bf45e60639d655e31652aea96a63e857d 100644 (file)
--- a/ext/com_dotnet/com_handlers.c
+++ b/ext/com_dotnet/com_handlers.c
@@ -127,6 +127,11 @@ static void com_write_dimension(zval *object, zval *offset, zval *value)
 
        obj = CDNO_FETCH(object);
 
+       if (offset == NULL) {
+               php_com_throw_exception(DISP_E_BADINDEX, "appending to variants is not supported");
+               return;
+       }
+
        if (V_VT(&obj->v) == VT_DISPATCH) {
                ZVAL_COPY_VALUE(&args[0], offset);
                ZVAL_COPY_VALUE(&args[1], value);

diff --git a/ext/com_dotnet/tests/bug78694.phpt b/ext/com_dotnet/tests/bug78694.phpt
new file mode 100644 (file)
index 0000000..adf0c82
--- /dev/null
+++ b/ext/com_dotnet/tests/bug78694.phpt
@@ -0,0 +1,19 @@
+--TEST--
+Bug #78694 (Appending to a variant array causes segfault)
+--SKIPIF--
+<?php
+if (!extension_loaded('com_dotnet')) die('skip com_dotnet extension not available');
+?>
+--FILE--
+<?php
+foreach ([new com('WScript.Shell'), new variant([])] as $var) {
+    try {
+        $var[] = 42;
+    } catch (com_exception $ex) {
+        var_dump($ex->getMessage());
+    }
+}
+?>
+--EXPECT--
+string(38) "appending to variants is not supported"
+string(38) "appending to variants is not supported"