tony2001 Wed Sep 6 12:40:57 2006 UTC
Modified files: (Branch: PHP_5_2)
/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.331.2.13.2.3&r2=1.331.2.13.2.4&diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.331.2.13.2.3
php-src/ext/pgsql/pgsql.c:1.331.2.13.2.4
--- php-src/ext/pgsql/pgsql.c:1.331.2.13.2.3 Thu Jun 15 18:33:08 2006
+++ php-src/ext/pgsql/pgsql.c Wed Sep 6 12:40:56 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.331.2.13.2.3 2006/06/15 18:33:08 dmitry Exp $ */
+/* $Id: pgsql.c,v 1.331.2.13.2.4 2006/09/06 12:40:56 tony2001 Exp $ */
#include <stdlib.h>
@@ -3309,12 +3309,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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
