Fixed bug #65336

diff --git a/NEWS b/NEWS
index 8f7bbd8c7cf5fa459e7c2f9daf4de32e416d0041..97c25dfc04ca25fb2012b41ee5eb8f38ae7737cf 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,10 @@ PHP                                                                        NEWS
   . Fixed bug #65028 (Phar::buildFromDirectory creates corrupt archives for 
     some specific contents). (Stas)
 
+- Pgsql:
+  . Fixed bug #65336 (pg_escape_literal/identifier() scilently returns false).
+    (Yasuo)
+
 ?? ??? 2013, PHP 5.4.18
 
 - Core:

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 1b302668afc65cd8df2c369203f1730be39f3d37..796d8835c7ff19ac3ab4c3662a6814481017cdc4 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -4294,12 +4294,13 @@ static void php_pgsql_escape_internal(INTERNAL_FUNCTION_PARAMETERS, int escape_l
        }
 
        if (pgsql_link == NULL && id == -1) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING,"Cannot get default pgsql link");
                RETURN_FALSE;
        }
 
        ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink);
        if (pgsql == NULL) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING,"Cannot get default pgsql link");
+               php_error_docref(NULL TSRMLS_CC, E_WARNING,"Cannot get pgsql link");
                RETURN_FALSE;
        }
 #ifdef HAVE_PQESCAPELITERAL