Skip to content

Commit 10dc924

Browse files
committed
Use inlined version of zval_ptr_dytor() in var_destroy() loop
1 parent 5a51da9 commit 10dc924

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ext/standard/var_unserializer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,14 +233,14 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
233233
}
234234
}
235235

236-
zval_ptr_dtor(zv);
236+
i_zval_ptr_dtor(zv ZEND_FILE_LINE_CC);
237237
}
238238
next = var_dtor_hash->next;
239239
efree_size(var_dtor_hash, sizeof(var_dtor_entries));
240240
var_dtor_hash = next;
241241
}
242242

243-
zval_ptr_dtor(&wakeup_name);
243+
zval_ptr_dtor_nogc(&wakeup_name);
244244
}
245245

246246
/* }}} */

ext/standard/var_unserializer.re

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,14 +231,14 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
231231
}
232232
}
233233

234-
zval_ptr_dtor(zv);
234+
i_zval_ptr_dtor(zv ZEND_FILE_LINE_CC);
235235
}
236236
next = var_dtor_hash->next;
237237
efree_size(var_dtor_hash, sizeof(var_dtor_entries));
238238
var_dtor_hash = next;
239239
}
240240

241-
zval_ptr_dtor(&wakeup_name);
241+
zval_ptr_dtor_nogc(&wakeup_name);
242242
}
243243

244244
/* }}} */

0 commit comments

Comments
 (0)