From c95fa280ed2782f049e3ffd0b55b52136355f434 Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Tue, 22 Dec 2009 17:44:42 +0000 Subject: [PATCH] Fix double calls to free_contents if the connection cannot be opened. mysqlnd have no probs, external code should not have too. In any case, double call is not needed. --- ext/mysqlnd/mysqlnd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index ab24f0293b..e76d9ab05e 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -737,8 +737,6 @@ err: conn->scheme = NULL; } - /* This will also close conn->net->stream if it has been opened */ - conn->m->free_contents(conn TSRMLS_CC); MYSQLND_INC_CONN_STATISTIC(&conn->stats, STAT_CONNECT_FAILURE); DBG_RETURN(FAIL); @@ -776,6 +774,9 @@ PHPAPI MYSQLND * mysqlnd_connect(MYSQLND * conn, object - we are free to kill it! */ conn->m->dtor(conn TSRMLS_CC); + } else { + /* This will also close conn->net->stream if it has been opened */ + conn->m->free_contents(conn TSRMLS_CC); } DBG_RETURN(NULL); } -- 2.49.0