com php-src: Merge branch 'PHP-5.6': ext/pgsql/pgsql.c

From: Date: Tue, 30 Dec 2014 18:01:51 +0000
Subject: com php-src: Merge branch 'PHP-5.6': ext/pgsql/pgsql.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83938@lists.php.net to get a copy of this message
Commit: 2d561e0e26a511225ffafb25020c4931c6c17ae4 Author: Adam Harvey <aharvey@php.net> Tue, 30 Dec 2014 18:01:51 +0000 Parents: 68d212748d724ecc6be6ba5a2a6d3fc14bd6d740 3ef6e3726cd4006d7530b3ff5b27cb7abad7cc95 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2d561e0e26a511225ffafb25020c4931c6c17ae4 Log: Merge branch 'PHP-5.6' * PHP-5.6: Check the return value of lo_export. Changed paths: MM ext/pgsql/pgsql.c Diff: diff --cc ext/pgsql/pgsql.c index f863529,110a496..e4aab66 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@@ -3726,12 -3729,12 +3726,12 @@@ PHP_FUNCTION(pg_lo_export RETURN_FALSE; } - ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink); + ZEND_FETCH_RESOURCE2(pgsql, PGconn *, pgsql_link, id, "PostgreSQL link", le_link, le_plink); - if (lo_export(pgsql, oid, file_out)) { - RETURN_TRUE; + if (lo_export(pgsql, oid, file_out) == -1) { + RETURN_FALSE; } - RETURN_FALSE; + RETURN_TRUE; } /* }}} */

« previous php.cvs (#83938) next »