Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix leak and error check order

diff --cc ext/pgsql/pgsql.c
index 8f0db26c9244b0e1bf5bc36552265e739672ba42,f05efc7939716dbf30afff9818d891877249aa80..9ee81b1ac52c0f51a656bac896206885a6121a32
--- 1/ext/pgsql/pgsql.c
--- 2/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";
        }