From 9e70d7672dd646b8c9b29ccc452e4dc5aa015437 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Wed, 4 Feb 2015 15:24:13 +0300 Subject: Move zend_object->guards into additional slot of zend_object->properties_table[]. As result size of objects without __get/__set/__unset/__isset magic methods is reduced. --- ext/tidy/tidy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/tidy/tidy.c') diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index 03d8dd4b9a..b0fe2935a0 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -677,7 +677,7 @@ static zend_object *tidy_object_new(zend_class_entry *class_type, zend_object_ha { PHPTidyObj *intern; - intern = ecalloc(1, sizeof(PHPTidyObj) + sizeof(zval) * (class_type->default_properties_count - 1)); + intern = ecalloc(1, sizeof(PHPTidyObj) + zend_object_properties_size(class_type)); zend_object_std_init(&intern->std, class_type); object_properties_init(&intern->std, class_type); -- cgit v1.2.1 From 614a628ace34f9d1793d980d7f31e7650d8281cd Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 4 Feb 2015 12:33:34 +0100 Subject: fix data type --- ext/tidy/tidy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/tidy/tidy.c') diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index b0fe2935a0..5eeb3ca4ed 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -993,7 +993,7 @@ static void php_tidy_create_node(INTERNAL_FUNCTION_PARAMETERS, tidy_base_nodetyp static int _php_tidy_apply_config_array(TidyDoc doc, HashTable *ht_options) { zval *opt_val; - ulong opt_indx; + zend_ulong opt_indx; zend_string *opt_name; ZEND_HASH_FOREACH_KEY_VAL(ht_options, opt_indx, opt_name, opt_val) { -- cgit v1.2.1