tony2001 Thu Jan 11 16:47:32 2007 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/pgsql pgsql.c
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.244.2.40.2.6&r2=1.244.2.40.2.7&diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.244.2.40.2.6
php-src/ext/pgsql/pgsql.c:1.244.2.40.2.7
--- php-src/ext/pgsql/pgsql.c:1.244.2.40.2.6 Mon Jan 1 09:46:46 2007
+++ php-src/ext/pgsql/pgsql.c Thu Jan 11 16:47:32 2007
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.244.2.40.2.6 2007/01/01 09:46:46 sebastian Exp $ */
+/* $Id: pgsql.c,v 1.244.2.40.2.7 2007/01/11 16:47:32 tony2001 Exp $ */
#include <stdlib.h>
@@ -216,7 +216,7 @@
static int le_link, le_plink, le_result, le_lofp, le_string;
-ZEND_DECLARE_MODULE_GLOBALS(pgsql);
+ZEND_DECLARE_MODULE_GLOBALS(pgsql)
/* {{{ _php_pgsql_trim_message */
static char * _php_pgsql_trim_message(const char *message, int *len)
@@ -2658,10 +2658,11 @@
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(pg_rows), &pos);
while
(zend_hash_get_current_data_ex(Z_ARRVAL_P(pg_rows), (void **) &tmp, &pos) ==
SUCCESS) {
convert_to_string_ex(tmp);
- query = (char
*)emalloc(Z_STRLEN_PP(tmp) +2);
- strcpy(query, Z_STRVAL_PP(tmp));
- if(*(query+Z_STRLEN_PP(tmp)-1) != '\n')
- strcat(query, "\n");
+ query = (char
*)emalloc(Z_STRLEN_PP(tmp) + 2);
+ strlcpy(query, Z_STRVAL_PP(tmp),
Z_STRLEN_PP(tmp) + 2);
+ if(Z_STRLEN_PP(tmp) > 0 && *(query +
Z_STRLEN_PP(tmp) - 1) != '\n') {
+ strlcat(query, "\n",
Z_STRLEN_PP(tmp) + 2);
+ }
if (PQputline(pgsql, query)) {
efree(query);
PHP_PQ_ERROR("copy failed: %s",
pgsql);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
