]> granicus.if.org Git - php/commitdiff
Fix possible crash when conn is NULL
authorAndrey Hristov <andrey@php.net>
Fri, 25 Sep 2009 10:37:44 +0000 (10:37 +0000)
committerAndrey Hristov <andrey@php.net>
Fri, 25 Sep 2009 10:37:44 +0000 (10:37 +0000)
ext/mysqlnd/mysqlnd.c

index e5dc531e23bb8221047077e075206a4a01fd2afc..222b2e5f612f89e049b7721cd9925dda1b7c9386 100644 (file)
@@ -508,8 +508,8 @@ PHPAPI MYSQLND *mysqlnd_connect(MYSQLND *conn,
                                host?host:"", user?user:"", db?db:"", port, mysql_flags,
                                conn? conn->persistent:0, conn? CONN_GET_STATE(conn):-1);
 
-       DBG_INF_FMT("state=%d", CONN_GET_STATE(conn));
        if (conn && CONN_GET_STATE(conn) > CONN_ALLOCED && CONN_GET_STATE(conn) ) {
+               DBG_INF_FMT("state=%d", CONN_GET_STATE(conn));
                DBG_INF("Connecting on a connected handle.");
 
                if (CONN_GET_STATE(conn) < CONN_QUIT_SENT) {