- Fixed bug #49174 (crash on queryString set)

diff --git a/NEWS b/NEWS
index ad2ce231d5c8d8ee503bc1083caf106726d6b625..b2ed1d95502513501c467d4af5cefda799e284b8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -116,6 +116,7 @@ PHP                                                                        NEWS
 - Fixed bug #49244 (Floating point NaN cause garbage characters). (Sjoerd)
 - Fixed bug #49224 (Compile error due to old DNS functions on AIX systems).
   (Scott)
+- Fixed bug #49174 (crash on queryString set). (Felipe)
 - Fixed bug #47848 (importNode doesn't preserve attribute namespaces). (Rob)
 - Fixed bug #45120 (PDOStatement->execute() returns true then false for same
   statement). (Pierrick)

diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index 7f81d9408a1a432a2b18e6b085e8afba1b7482f8..2564587e4696bfaee6f83180991d2d053ec809ab 100755 (executable)
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -44,7 +44,7 @@ void pdo_raise_impl_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *sqlstate
        char *message = NULL;
        const char *msg;
 
-       if (dbh->error_mode == PDO_ERRMODE_SILENT) {
+       if (dbh && dbh->error_mode == PDO_ERRMODE_SILENT) {
 #if 0
                /* BUG: if user is running in silent mode and hits an error at the driver level
                 * when they use the PDO methods to call up the error information, they may
@@ -71,7 +71,7 @@ void pdo_raise_impl_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *sqlstate
                spprintf(&message, 0, "SQLSTATE[%s]: %s", *pdo_err, msg);
        }
 
-       if (dbh->error_mode != PDO_ERRMODE_EXCEPTION) {
+       if (dbh && dbh->error_mode != PDO_ERRMODE_EXCEPTION) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", message);
        } else {
                zval *ex, *info;