diff options
Diffstat (limited to 'ext/standard')
| -rw-r--r-- | ext/standard/browscap.c | 4 | ||||
| -rw-r--r-- | ext/standard/password.c | 4 | ||||
| -rw-r--r-- | ext/standard/scanf.c | 2 | ||||
| -rw-r--r-- | ext/standard/var_unserializer.re | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c index abb5d69df8..e9ee1b1f0e 100644 --- a/ext/standard/browscap.c +++ b/ext/standard/browscap.c @@ -418,8 +418,8 @@ static int browscap_read_file(char *filename, browser_data *browdata, int persis } browdata->htab = pemalloc(sizeof *browdata->htab, persistent); - zend_hash_init_ex(browdata->htab, 0, NULL, - persistent ? browscap_entry_dtor_persistent : browscap_entry_dtor, persistent, 0); + zend_hash_init(browdata->htab, 0, NULL, + persistent ? browscap_entry_dtor_persistent : browscap_entry_dtor, persistent); browdata->kv_size = 16 * 1024; browdata->kv_used = 0; diff --git a/ext/standard/password.c b/ext/standard/password.c index ea28ee6145..de21569a44 100644 --- a/ext/standard/password.c +++ b/ext/standard/password.c @@ -592,8 +592,8 @@ PHP_FUNCTION(password_get_info) add_assoc_string(return_value, "algoName", algo->name); if (algo->get_info && (FAILURE == algo->get_info(&options, hash))) { - zval_dtor(&options); - zval_dtor(return_value); + zval_ptr_dtor_nogc(&options); + zval_ptr_dtor_nogc(return_value); RETURN_NULL(); } add_assoc_zval(return_value, "options", &options); diff --git a/ext/standard/scanf.c b/ext/standard/scanf.c index 1464008243..9f6986ab16 100644 --- a/ext/standard/scanf.c +++ b/ext/standard/scanf.c @@ -906,7 +906,7 @@ literal: __buf[0] = sch; __buf[1] = '\0'; current = args[objIndex++]; - zval_dtor(*current); + zval_ptr_dtor_nogc(*current); ZVAL_STRINGL( *current, __buf, 1); } else { add_index_stringl(return_value, objIndex++, &sch, 1); diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index 1fc0e0dcda..e7a48d4d8e 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -597,7 +597,7 @@ string_key: if (!zend_verify_prop_assignable_by_ref(info, data, /* strict */ 1)) { zval_ptr_dtor(data); ZVAL_UNDEF(data); - zval_dtor(&key); + zval_ptr_dtor_nogc(&key); goto failure; } if (Z_ISREF_P(data)) { |