diff options
| author | Pierre Joye <pajoye@php.net> | 2011-01-17 14:01:01 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2011-01-17 14:01:01 +0000 |
| commit | 59dc22153040849f0c3348985107146facca29c2 (patch) | |
| tree | 2943f27c11d7915a5dc7a63ae88af3ee4a6efb8c /ext/mysqlnd/mysqlnd_ps.c | |
| parent | 78b60fcc97250ae70361c2c21039dbc0907ea91b (diff) | |
| download | php-git-59dc22153040849f0c3348985107146facca29c2.tar.gz | |
- fix NULL derefencing
Diffstat (limited to 'ext/mysqlnd/mysqlnd_ps.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_ps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c index 3f3995a1d2..9e0237da60 100644 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@ -735,7 +735,7 @@ mysqlnd_fetch_stmt_row_buffered(MYSQLND_RES *result, void *param, unsigned int f DBG_ENTER("mysqlnd_fetch_stmt_row_buffered"); *fetched_anything = FALSE; - DBG_INF_FMT("stmt=%lu", stmt->stmt_id); + DBG_INF_FMT("stmt=%lu", stmt != NULL ? stmt->stmt_id : 0L); /* If we haven't read everything */ if (set->data_cursor && @@ -2223,9 +2223,9 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_stmt, net_close)(MYSQLND_STMT * const s, zend_boo static enum_func_status MYSQLND_METHOD(mysqlnd_stmt, dtor)(MYSQLND_STMT * const s, zend_bool implicit TSRMLS_DC) { - MYSQLND_STMT_DATA * stmt = s? s->data:NULL; + MYSQLND_STMT_DATA * stmt = (s == NULL) ? s->data:NULL; enum_func_status ret = FAIL; - zend_bool persistent = s->persistent; + zend_bool persistent = (s == NULL) ? s->persistent : 0; DBG_ENTER("mysqlnd_stmt::dtor"); if (stmt) { |