diff options
author | Yasuo Ohgaki <yohgaki@php.net> | 2013-07-27 05:46:11 +0900 |
---|---|---|
committer | Yasuo Ohgaki <yohgaki@php.net> | 2013-07-27 05:54:09 +0900 |
commit | 1d7b6970f20a059c501e68927c9fb874bdb226bc (patch) | |
tree | b3baab6ea12660db1b9485a425b7f9cb9ef7b87e | |
parent | fd616ba50f11f13483f46b1d64d90f0d6e91cfac (diff) | |
download | php-git-1d7b6970f20a059c501e68927c9fb874bdb226bc.tar.gz |
Fixed bug #65336
-rw-r--r-- | NEWS | 4 | ||||
-rw-r--r-- | ext/pgsql/pgsql.c | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -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 |