summaryrefslogtreecommitdiff
path: root/ext/com_dotnet/com_saproxy.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2019-04-16 00:09:45 +0300
committerDmitry Stogov <dmitry@zend.com>2019-04-16 00:09:45 +0300
commit10aeed5be4da5344768f0cab9b1e46c756277efe (patch)
tree88c7191236940fd2ab37943c6feefcdd4a9c2ff6 /ext/com_dotnet/com_saproxy.c
parent3f7bf35e169556f441e5840909261f1677fff640 (diff)
parent68842534616cd0ab29af4c1b8966c4ebf9900c2c (diff)
downloadphp-git-10aeed5be4da5344768f0cab9b1e46c756277efe.tar.gz
Merge branch 'PHP-7.4' of git.php.net:php-src into PHP-7.4
* 'PHP-7.4' of git.php.net:php-src: Remove not needed extension generated files gitignores Add test for curl_version() Fixed bug #77895 Zero sockaddr struct Fix saproxy_property_write signature Correctly destroy reference in ArrayObject sort
Diffstat (limited to 'ext/com_dotnet/com_saproxy.c')
-rw-r--r--ext/com_dotnet/com_saproxy.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/com_dotnet/com_saproxy.c b/ext/com_dotnet/com_saproxy.c
index 7eec446a3f..15f68367c4 100644
--- a/ext/com_dotnet/com_saproxy.c
+++ b/ext/com_dotnet/com_saproxy.c
@@ -78,9 +78,10 @@ static zval *saproxy_property_read(zval *object, zval *member, int type, void **
return rv;
}
-static void saproxy_property_write(zval *object, zval *member, zval *value, void **cache_slot)
+static zval *saproxy_property_write(zval *object, zval *member, zval *value, void **cache_slot)
{
php_com_throw_exception(E_INVALIDARG, "safearray has no properties");
+ return value;
}
static zval *saproxy_read_dimension(zval *object, zval *offset, int type, zval *rv)