]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorChristoph M. Becker <cmbecker69@gmx.de>
Wed, 9 Oct 2019 12:17:25 +0000 (14:17 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Wed, 9 Oct 2019 12:17:25 +0000 (14:17 +0200)
* PHP-7.4:
  Fix #78650: new COM Crash

1  2 
ext/com_dotnet/com_handlers.c

index c9b7d898ed3df3632a76deaf82a8b9b092670ccb,8a70e60d764b426dab4ee03dabad882b0129e002..1036abb977c4dbbd6e6d7c711674e1233fb63db9
@@@ -172,7 -174,25 +172,12 @@@ static void com_write_dimension(zend_ob
        }
  }
  
 -#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 zval *com_get_property_ptr_ptr(zval *object, zval *member, int type, void **cache_slot)
+ {
+       return NULL;
+ }
 +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,