cvs: php-src /ext/pgsql pgsql.c

tony2001 Wed Sep 6 12:40:47 2006 UTC Modified files: /php-src/ext/pgsql pgsql.c Log: fix leak in pg_copy_to() when invalid resource was passed http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.352&r2=1.353&diff_format=u Index: php-src/ext/pgsql/pgsql.c diff -u php-src/ext/pgsql/pgsql.c:1.352 php-src/ext/pgsql/pgsql.c:1.353 --- php-src/ext/pgsql/pgsql.c:1.352 Tue Jun 13 13:12:19 2006 +++ php-src/ext/pgsql/pgsql.c Wed Sep 6 12:40:47 2006 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.352 2006/06/13 13:12:19 dmitry Exp $ */ +/* $Id: pgsql.c,v 1.353 2006/09/06 12:40:47 tony2001 Exp $ */ #include <stdlib.h> @@ -3296,12 +3296,13 @@ if (!pg_delim) { pg_delim = "\t"; } + + ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink); + if (!pg_null_as) { pg_null_as = safe_estrdup("\\\\N"); } - ZEND_FETCH_RESOURCE2(pgsql, PGconn *, &pgsql_link, id, "PostgreSQL link", le_link, le_plink); - query = (char *)emalloc(strlen(query_template) + strlen(table_name) + strlen(pg_null_as) + 1); sprintf(query, "COPY \"%s\" TO STDOUT DELIMITERS '%c' WITH NULL AS '%s'", table_name, *pg_delim, pg_null_as);