From: Pierre Joye <pajoye@php.net>
Date: Mon, 17 Jan 2011 14:01:01 +0000 (+0000)
Subject: - fix NULL derefencing
X-Git-Tag: php-5.3.6RC1~111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c23366d6b788d69fdc67f8546f655c8c9bbbe48;p=php

- fix NULL derefencing
---

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) {