archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Init should return status value because initialization can fail.

Browse source 
In this case mysqlnd_init() should return NULL to the end-user.
This commit is contained in:
Andrey Hristov 2010-05-25 22:40:47 +00:00
parent 621cdd9019
commit bcdc3b30f7
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ext/mysqlnd/mysqlnd.c
View file

@ -2140,7 +2140,7 @@ MYSQLND_METHOD(mysqlnd_conn, get_connection_stats)(const MYSQLND * const conn,
MYSQLND_STMT * _mysqlnd_stmt_init(MYSQLND * const conn TSRMLS_DC);
static void MYSQLND_METHOD(mysqlnd_conn, init)(MYSQLND * conn TSRMLS_DC);
static enum_func_status MYSQLND_METHOD(mysqlnd_conn, init)(MYSQLND * conn TSRMLS_DC);
static
MYSQLND_CLASS_METHODS_START(mysqlnd_conn)
@ -2217,17 +2217,17 @@ MYSQLND_CLASS_METHODS_END;
/* {{{ mysqlnd_conn::init */
static void
static enum_func_status
MYSQLND_METHOD(mysqlnd_conn, init)(MYSQLND * conn TSRMLS_DC)
{
DBG_ENTER("mysqlnd_conn::init");
conn->net = mysqlnd_net_init(conn->persistent TSRMLS_CC);
conn->protocol = mysqlnd_protocol_init(conn->persistent TSRMLS_CC);
mysqlnd_stats_init(&conn->stats, STAT_LAST);
SET_ERROR_AFF_ROWS(conn);
DBG_VOID_RETURN;
conn->net = mysqlnd_net_init(conn->persistent TSRMLS_CC);
conn->protocol = mysqlnd_protocol_init(conn->persistent TSRMLS_CC);
DBG_RETURN(conn->net && conn->protocol? PASS:FAIL);
}
/* }}} */
@ -2249,7 +2249,10 @@ PHPAPI MYSQLND * _mysqlnd_init(zend_bool persistent TSRMLS_DC)
CONN_SET_STATE(ret, CONN_ALLOCED);
ret->m->get_reference(ret TSRMLS_CC);
ret->m->init(ret TSRMLS_CC);
if (PASS != ret->m->init(ret TSRMLS_CC)) {
ret->m->dtor(ret TSRMLS_CC);
ret = NULL;
}
DBG_RETURN(ret);
}