Skip to content

Commit 9513187

Browse files
committed
fix leak and error check order
1 parent bca913d commit 9513187

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

ext/pgsql/pgsql.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4043,12 +4043,12 @@ PHP_FUNCTION(pg_copy_to)
40434043
&pg_delim, &pg_delim_len, &pg_null_as, &pg_null_as_len) == FAILURE) {
40444044
return;
40454045
}
4046-
if (!pg_delim) {
4047-
pg_delim = "\t";
4048-
}
40494046

40504047
ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink);
40514048

4049+
if (!pg_delim) {
4050+
pg_delim = "\t";
4051+
}
40524052
if (!pg_null_as) {
40534053
pg_null_as = safe_estrdup("\\\\N");
40544054
free_pg_null = 1;
@@ -4176,6 +4176,9 @@ PHP_FUNCTION(pg_copy_from)
41764176
&pg_delim, &pg_delim_len, &pg_null_as, &pg_null_as_len) == FAILURE) {
41774177
return;
41784178
}
4179+
4180+
ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink);
4181+
41794182
if (!pg_delim) {
41804183
pg_delim = "\t";
41814184
}
@@ -4184,8 +4187,6 @@ PHP_FUNCTION(pg_copy_from)
41844187
pg_null_as_free = 1;
41854188
}
41864189

4187-
ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink);
4188-
41894190
spprintf(&query, 0, "COPY %s FROM STDIN DELIMITERS E'%c' WITH NULL AS E'%s'", table_name, *pg_delim, pg_null_as);
41904191
while ((pgsql_result = PQgetResult(pgsql))) {
41914192
PQclear(pgsql_result);

0 commit comments

Comments
 (0)