From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 9 Oct 2019 12:17:25 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73e9acbaff0f4bcdc3ff99fb54504af2e23fec42;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #78650: new COM Crash
---

73e9acbaff0f4bcdc3ff99fb54504af2e23fec42
diff --cc ext/com_dotnet/com_handlers.c
index c9b7d898ed,8a70e60d76..1036abb977
--- a/ext/com_dotnet/com_handlers.c
+++ b/ext/com_dotnet/com_handlers.c
@@@ -172,7 -174,25 +172,12 @@@ static void com_write_dimension(zend_ob
  	}
  }
  
+ static zval *com_get_property_ptr_ptr(zval *object, zval *member, int type, void **cache_slot)
+ {
+ 	return NULL;
+ }
+ 
 -#if 0
 -static void com_object_set(zval **property, zval *value)
 -{
 -	/* Not yet implemented in the engine */
 -}
 -
 -static zval *com_object_get(zval *property)
 -{
 -	/* Not yet implemented in the engine */
 -	return NULL;
 -}
 -#endif
 -
 -static int com_property_exists(zval *object, zval *member, int check_empty, void **cache_slot)
 +static int com_property_exists(zend_object *object, zend_string *member, int check_empty, void **cache_slot)
  {
  	DISPID dispid;
  	php_com_dotnet_object *obj;
@@@ -531,7 -551,9 +536,7 @@@ zend_object_handlers php_com_object_han
  	com_property_write,
  	com_read_dimension,
  	com_write_dimension,
- 	NULL,
+ 	com_get_property_ptr_ptr,
 -	NULL, /* com_object_get, */
 -	NULL, /* com_object_set, */
  	com_property_exists,
  	com_property_delete,
  	com_dimension_exists,