From: Andrey Hristov <andrey@php.net>
Date: Thu, 12 Aug 2010 14:17:31 +0000 (+0000)
Subject: Make this function static, as it is used only in this file.
X-Git-Tag: php-5.4.0alpha1~191^2~1106
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c803b0024a6baa7caf362a19708738bd489bc12d;p=php

Make this function static, as it is used only in this file.
Add additional comment about how it works.
---

diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index 4d4fbd296a..bc095e27a0 100644
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -86,12 +86,11 @@ MYSQLND_METHOD(mysqlnd_res, initialize_result_set_rest)(MYSQLND_RES * const resu
 /* }}} */
 
 
-
 /* {{{ mysqlnd_palloc_zval_ptr_dtor */
+static
 void mysqlnd_palloc_zval_ptr_dtor(zval **zv, enum_mysqlnd_res_type type, zend_bool * copy_ctor_called TSRMLS_DC)
 {
 	DBG_ENTER("mysqlnd_palloc_zval_ptr_dtor");
-	*copy_ctor_called = FALSE;
 
 	/*
 	  This zval is not from the cache block.
@@ -99,6 +98,7 @@ void mysqlnd_palloc_zval_ptr_dtor(zval **zv, enum_mysqlnd_res_type type, zend_bo
 	  because the zvals from the cache are owned by it.
 	*/
 	if (type == MYSQLND_RES_PS_BUF || type == MYSQLND_RES_PS_UNBUF) {
+		*copy_ctor_called = FALSE;
 		; /* do nothing, zval_ptr_dtor will do the job*/
 	} else if (Z_REFCOUNT_PP(zv) > 1) {
 		/*
@@ -120,6 +120,12 @@ void mysqlnd_palloc_zval_ptr_dtor(zval **zv, enum_mysqlnd_res_type type, zend_bo
 		}
 		*copy_ctor_called = TRUE;
 	} else {
+		/*
+		  noone but us point to this, so we can safely ZVAL_NULL the zval,
+		  so Zend does not try to free what the zval points to - which is
+		  in result set buffers
+		*/
+		*copy_ctor_called = FALSE;
 		if (Z_TYPE_PP(zv) == IS_STRING) {
 			ZVAL_NULL(*zv);
 		}