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.

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index ab24f0293b94f2cd0ed5c744aef754c4fea7466c..e76d9ab05ec2f956e069d65302a5cfb6b22357aa 100644 (file)
--- 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);
        }