From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 29 Jun 2017 09:16:52 +0000 (+0300)
Subject: Use inlined version of zval_ptr_dytor() in var_destroy() loop
X-Git-Tag: php-7.2.0alpha3~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10dc924999a473406591ebbbf1dad184aef163e4;p=php

Use inlined version of zval_ptr_dytor() in var_destroy() loop
---

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 612c34aaeb..b480bb2ee3 100644
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -233,14 +233,14 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
 				}
 			}
 
-			zval_ptr_dtor(zv);
+			i_zval_ptr_dtor(zv ZEND_FILE_LINE_CC);
 		}
 		next = var_dtor_hash->next;
 		efree_size(var_dtor_hash, sizeof(var_dtor_entries));
 		var_dtor_hash = next;
 	}
 
-	zval_ptr_dtor(&wakeup_name);
+	zval_ptr_dtor_nogc(&wakeup_name);
 }
 
 /* }}} */
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index b75c0d2d10..6b5f3ef4e0 100644
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -231,14 +231,14 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
 				}
 			}
 
-			zval_ptr_dtor(zv);
+			i_zval_ptr_dtor(zv ZEND_FILE_LINE_CC);
 		}
 		next = var_dtor_hash->next;
 		efree_size(var_dtor_hash, sizeof(var_dtor_entries));
 		var_dtor_hash = next;
 	}
 
-	zval_ptr_dtor(&wakeup_name);
+	zval_ptr_dtor_nogc(&wakeup_name);
 }
 
 /* }}} */