[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c trunk/ext/mysqlnd/mysqlnd_net.c

[Andrey Hristov]

andrey                                   Wed, 16 Dec 2009 14:38:30 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=292212

Log:
call free_contents in every case, in case something is not freed
by the calling code

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c
    U   php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c      2009-12-16 
14:06:09 UTC (rev 292211)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c      2009-12-16 
14:38:30 UTC (rev 292212)
@@ -287,6 +287,7 @@
        DBG_ENTER("mysqlnd_net_free");

        if (net) {
+               net->m.free_contents(net TSRMLS_CC);
                if (net->cmd_buffer.buffer) {
                        DBG_INF("Freeing cmd buffer");
                        mnd_pefree(net->cmd_buffer.buffer, pers);

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c 2009-12-16 14:06:09 UTC (rev 
292211)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c 2009-12-16 14:38:30 UTC (rev 
292212)
@@ -287,6 +287,7 @@
        DBG_ENTER("mysqlnd_net_free");

        if (net) {
+               net->m.free_contents(net TSRMLS_CC);
                if (net->cmd_buffer.buffer) {
                        DBG_INF("Freeing cmd buffer");
                        mnd_pefree(net->cmd_buffer.buffer, pers);


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php