com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/pgsql/pgsql.c
| From: | Anatol Belski | Date: | Sat, 03 Sep 2016 15:03:55 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/pgsql/pgsql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94278@lists.php.net to get a copy of this message | ||
Commit: c9040d43a88d21a8cfe9329c2f97400919dfc283
Author: Anatol Belski <ab@php.net> Sat, 3 Sep 2016 17:03:55 +0200
Parents: 0bc7e0c0ce7096590fdb3dce62e949df47c4c245 9513187deec82ffb2f56b86ce5f940d1fb5329f9
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c9040d43a88d21a8cfe9329c2f97400919dfc283
Log:
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix leak and error check order
Changed paths:
MM ext/pgsql/pgsql.c
Diff:
diff --cc ext/pgsql/pgsql.c
index 8f0db26,f05efc7..9ee81b1
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@@ -4083,16 -4043,14 +4083,16 @@@ PHP_FUNCTION(pg_copy_to
&pg_delim, &pg_delim_len, &pg_null_as, &pg_null_as_len) == FAILURE) {
return;
}
- if (!pg_delim) {
- pg_delim = "\t";
- }
- ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link,
le_plink);
+ if ((pgsql = (PGconn *)zend_fetch_resource2(Z_RES_P(pgsql_link), "PostgreSQL link",
le_link, le_plink)) == NULL) {
+ RETURN_FALSE;
+ }
+ if (!pg_delim) {
+ pg_delim = "\t";
+ }
if (!pg_null_as) {
- pg_null_as = safe_estrdup("\\\\N");
+ pg_null_as = estrdup("\\\\N");
free_pg_null = 1;
}
@@@ -4216,6 -4176,9 +4216,11 @@@ PHP_FUNCTION(pg_copy_from
&pg_delim, &pg_delim_len, &pg_null_as, &pg_null_as_len) == FAILURE) {
return;
}
+
- ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link,
le_plink);
++ if ((pgsql = (PGconn *)zend_fetch_resource2(Z_RES_P(pgsql_link), "PostgreSQL link",
le_link, le_plink)) == NULL) {
++ RETURN_FALSE;
++ }
+
if (!pg_delim) {
pg_delim = "\t";
}