- Fixed bug #53517 (segfault in pgsql_stmt_execute() when postgres is down)

  patch by: gyp at balabit dot hu

diff --git a/NEWS b/NEWS
index b67578771a3c8a4a4b2ddb9d4f57a0936b6cff1a..06e28efcf8ce81e8844e5d4597ae978089fff5e9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,10 @@
   . Fixed bug #39199 (Cannot load Lob data with more than 4000 bytes on
     ORACLE 10). (spatar at mail dot nnov dot ru)
     
+- PDO PostgreSQL driver:
+  . Fixed bug #53517 (segfault in pgsql_stmt_execute() when postgres is down).
+    (gyp at balabit dot hu)
+    
 - Zend Engine:
   . Indirect reference to $this fails to resolve if direct $this is never used
     in method. (Scott)

diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c
index b0829452f66c29f383d1eb2dd2c86c0a56eae650..6380acbfc14a3135adef857b982e9e1ebdbe0c2a 100644 (file)
--- a/ext/pdo_pgsql/pgsql_statement.c
+++ b/ext/pdo_pgsql/pgsql_statement.c
@@ -184,7 +184,7 @@ stmt_retry:
                                         * chance to DEALLOCATE the prepared statements it has created. so, if we hit a 42P05 we 
                                         * deallocate it and retry ONCE (thies 2005.12.15)
                                         */
-                                       if (!strcmp(sqlstate, "42P05")) {
+                                       if (sqlstate && !strcmp(sqlstate, "42P05")) {
                                                char buf[100]; /* stmt_name == "pdo_crsr_%08x" */
                                                PGresult *res;
                                                snprintf(buf, sizeof(buf), "DEALLOCATE %s", S->stmt_name);