cvs: php-src /ext/odbc php_odbc.c

From: Date: Thu, 28 Dec 2006 14:26:30 +0000
Subject: cvs: php-src /ext/odbc php_odbc.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-42446@lists.php.net to get a copy of this message
tony2001 Thu Dec 28 14:26:30 2006 UTC Modified files: /php-src/ext/odbc php_odbc.c Log: use strlcat() http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/php_odbc.c?r1=1.196&r2=1.197&diff_format=u Index: php-src/ext/odbc/php_odbc.c diff -u php-src/ext/odbc/php_odbc.c:1.196 php-src/ext/odbc/php_odbc.c:1.197 --- php-src/ext/odbc/php_odbc.c:1.196 Wed Jun 14 05:51:16 2006 +++ php-src/ext/odbc/php_odbc.c Thu Dec 28 14:26:30 2006 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.196 2006/06/14 05:51:16 dmitry Exp $ */ +/* $Id: php_odbc.c,v 1.197 2006/12/28 14:26:30 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -2083,23 +2083,23 @@ if (strstr(db, "pwd") || strstr(db, "PWD")) { pwd = NULL; } - strncpy( lpszConnStr, db, CONNSTRSIZE); + strlcpy( lpszConnStr, db, CONNSTRSIZE); } else { strcpy(lpszConnStr, "DSN="); - strcat(lpszConnStr, db); + strlcat(lpszConnStr, db, CONNSTRSIZE); } if (uid) { if (uid[0]) { - strcat(lpszConnStr, ";UID="); - strcat(lpszConnStr, uid); - strcat(lpszConnStr, ";"); + strlcat(lpszConnStr, ";UID=", CONNSTRSIZE); + strlcat(lpszConnStr, uid, CONNSTRSIZE); + strlcat(lpszConnStr, ";", CONNSTRSIZE); } if (pwd) { if (pwd[0]) { - strcat(lpszConnStr, "PWD="); - strcat(lpszConnStr, pwd); - strcat(lpszConnStr, ";"); + strlcat(lpszConnStr, "PWD=", CONNSTRSIZE); + strlcat(lpszConnStr, pwd, CONNSTRSIZE); + strlcat(lpszConnStr, ";", CONNSTRSIZE); } } }

« previous php.cvs (#42446) next »