Fixed bug #65336

Yasuo Ohgaki · Yasuo Ohgaki · commit 1d7b6970f20a · 2013-07-27T05:54:09.000+09:00
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -4294,12 +4294,13 @@ static void php_pgsql_escape_internal(INTERNAL_FUNCTION_PARAMETERS, int escape_l`
`4294`	`4294`	`}`
`4295`	`4295`
`4296`	`4296`	`if (pgsql_link == NULL && id == -1) {`
	`4297`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"Cannot get default pgsql link");`
`4297`	`4298`	`RETURN_FALSE;`
`4298`	`4299`	`}`
`4299`	`4300`
`4300`	`4301`	`ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink);`
`4301`	`4302`	`if (pgsql == NULL) {`
`4302`		`- php_error_docref(NULL TSRMLS_CC, E_WARNING,"Cannot get default pgsql link");`
	`4303`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"Cannot get pgsql link");`
`4303`	`4304`	`RETURN_FALSE;`
`4304`	`4305`	`}`
`4305`	`4306`	`#ifdef HAVE_PQESCAPELITERAL`