From: Yasuo Ohgaki <yohgaki@php.net>
Date: Fri, 26 Jul 2013 20:46:11 +0000 (+0900)
Subject: Fixed bug #65336
X-Git-Tag: php-5.5.2~27^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d7b6970f20a059c501e68927c9fb874bdb226bc;p=php

Fixed bug #65336
---

diff --git a/NEWS b/NEWS
index 8f7bbd8c7c..97c25dfc04 100644
--- 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 1b302668af..796d8835c7 100644
--- 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