felipe                                   Sun, 13 Dec 2009 19:53:44 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=292083

Log:
- Fixed bug #49174 (crash on queryString set)

Bug: http://bugs.php.net/49174 (Feedback) crash on queryString set
      
Changed paths:
    U   php/php-src/branches/PHP_5_2/NEWS
    U   php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c
    U   php/php-src/trunk/ext/pdo/pdo_dbh.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS   2009-12-13 17:13:58 UTC (rev 292082)
+++ php/php-src/branches/PHP_5_2/NEWS   2009-12-13 19:53:44 UTC (rev 292083)
@@ -5,6 +5,7 @@
   seg fault). (davbrown4 at yahoo dot com, Felipe)
 - Fixed bug #50209 (Compiling with libedit cannot find readline.h).
   (tcallawa at redhat dot com)
+- Fixed bug #49174 (crash on queryString set). (Felipe)

 10 Dec 2009, PHP 5.2.12RC4
 - Added LIBXML_PARSEHUGE constant to overrides the maximum text size of a

Modified: php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c      2009-12-13 17:13:58 UTC 
(rev 292082)
+++ php/php-src/branches/PHP_5_2/ext/pdo/pdo_dbh.c      2009-12-13 19:53:44 UTC 
(rev 292083)
@@ -44,7 +44,7 @@
        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 @@
                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;

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2009-12-13 17:13:58 UTC (rev 292082)
+++ php/php-src/branches/PHP_5_3/NEWS   2009-12-13 19:53:44 UTC (rev 292083)
@@ -116,6 +116,7 @@
 - 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)

Modified: php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c      2009-12-13 17:13:58 UTC 
(rev 292082)
+++ php/php-src/branches/PHP_5_3/ext/pdo/pdo_dbh.c      2009-12-13 19:53:44 UTC 
(rev 292083)
@@ -44,7 +44,7 @@
        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 @@
                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;

Modified: php/php-src/trunk/ext/pdo/pdo_dbh.c
===================================================================
--- php/php-src/trunk/ext/pdo/pdo_dbh.c 2009-12-13 17:13:58 UTC (rev 292082)
+++ php/php-src/trunk/ext/pdo/pdo_dbh.c 2009-12-13 19:53:44 UTC (rev 292083)
@@ -44,7 +44,7 @@
        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 @@
                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;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to