andrey Tue Jan 8 13:11:55 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlnd mysqlnd.c mysqlnd_debug.h mysqlnd_enum_n_def.h
mysqlnd_loaddata.c mysqlnd_palloc.h
mysqlnd_priv.h mysqlnd_result.h
mysqlnd_result_meta.h mysqlnd_statistics.h
mysqlnd_wireprotocol.c mysqlnd_wireprotocol.h
php_mysqlnd.h
Log:
strncpy->strlcpy
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.5.2.6&r2=1.5.2.7&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.5.2.6
php-src/ext/mysqlnd/mysqlnd.c:1.5.2.7
--- php-src/ext/mysqlnd/mysqlnd.c:1.5.2.6 Wed Jan 2 21:14:34 2008
+++ php-src/ext/mysqlnd/mysqlnd.c Tue Jan 8 13:11:55 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd.c,v 1.5.2.6 2008/01/02 21:14:34 andrey Exp $ */
+/* $Id: mysqlnd.c,v 1.5.2.7 2008/01/08 13:11:55 andrey Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_wireprotocol.h"
@@ -676,14 +676,14 @@
} else if (ok_packet.field_count == 0xFF) {
if (ok_packet.sqlstate[0]) {
if (!self_alloced) {
- strncpy(conn->error_info.sqlstate,
ok_packet.sqlstate, sizeof(conn->error_info.sqlstate));
+ strlcpy(conn->error_info.sqlstate,
ok_packet.sqlstate, sizeof(conn->error_info.sqlstate));
}
DBG_ERR_FMT("ERROR:%d [SQLSTATE:%s] %s",
ok_packet.error_no,
ok_packet.sqlstate, ok_packet.error);
}
if (!self_alloced) {
conn->error_info.error_no = ok_packet.error_no;
- strncpy(conn->error_info.error,
ok_packet.error, sizeof(conn->error_info.error));
+ strlcpy(conn->error_info.error,
ok_packet.error, sizeof(conn->error_info.error));
}
}
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_debug.h?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_debug.h
diff -u php-src/ext/mysqlnd/mysqlnd_debug.h:1.1.2.4
php-src/ext/mysqlnd/mysqlnd_debug.h:1.1.2.5
--- php-src/ext/mysqlnd/mysqlnd_debug.h:1.1.2.4 Mon Dec 31 07:17:10 2007
+++ php-src/ext/mysqlnd/mysqlnd_debug.h Tue Jan 8 13:11:55 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_debug.h,v 1.1.2.4 2007/12/31 07:17:10 sebastian Exp $ */
+/* $Id: mysqlnd_debug.h,v 1.1.2.5 2008/01/08 13:11:55 andrey Exp $ */
#ifndef MYSQLND_DEBUG_H
#define MYSQLND_DEBUG_H
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_enum_n_def.h?r1=1.2.2.3&r2=1.2.2.4&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_enum_n_def.h
diff -u php-src/ext/mysqlnd/mysqlnd_enum_n_def.h:1.2.2.3
php-src/ext/mysqlnd/mysqlnd_enum_n_def.h:1.2.2.4
--- php-src/ext/mysqlnd/mysqlnd_enum_n_def.h:1.2.2.3 Mon Dec 31 07:17:10 2007
+++ php-src/ext/mysqlnd/mysqlnd_enum_n_def.h Tue Jan 8 13:11:55 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_enum_n_def.h,v 1.2.2.3 2007/12/31 07:17:10 sebastian Exp $ */
+/* $Id: mysqlnd_enum_n_def.h,v 1.2.2.4 2008/01/08 13:11:55 andrey Exp $ */
#ifndef MYSQLND_ENUM_N_DEF_H
#define MYSQLND_ENUM_N_DEF_H
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_loaddata.c?r1=1.2.2.3&r2=1.2.2.4&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_loaddata.c
diff -u php-src/ext/mysqlnd/mysqlnd_loaddata.c:1.2.2.3
php-src/ext/mysqlnd/mysqlnd_loaddata.c:1.2.2.4
--- php-src/ext/mysqlnd/mysqlnd_loaddata.c:1.2.2.3 Mon Dec 31 07:17:10 2007
+++ php-src/ext/mysqlnd/mysqlnd_loaddata.c Tue Jan 8 13:11:55 2008
@@ -113,7 +113,7 @@
DBG_ENTER("mysqlnd_local_infile_error");
if (info) {
- strncpy(error_buf, info->error_msg, error_buf_len);
+ strlcpy(error_buf, info->error_msg, error_buf_len);
DBG_INF_FMT("have info, %d", info->error_no);
DBG_RETURN(info->error_no);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_palloc.h?r1=1.2.2.3&r2=1.2.2.4&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_palloc.h
diff -u php-src/ext/mysqlnd/mysqlnd_palloc.h:1.2.2.3
php-src/ext/mysqlnd/mysqlnd_palloc.h:1.2.2.4
--- php-src/ext/mysqlnd/mysqlnd_palloc.h:1.2.2.3 Mon Dec 31 07:17:10 2007
+++ php-src/ext/mysqlnd/mysqlnd_palloc.h Tue Jan 8 13:11:55 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_palloc.h,v 1.2.2.3 2007/12/31 07:17:10 sebastian Exp $ */
+/* $Id: mysqlnd_palloc.h,v 1.2.2.4 2008/01/08 13:11:55 andrey Exp $ */
#ifndef MYSQLND_PALLOC_H
#define MYSQLND_PALLOC_H
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_priv.h?r1=1.4.2.5&r2=1.4.2.6&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_priv.h
diff -u php-src/ext/mysqlnd/mysqlnd_priv.h:1.4.2.5
php-src/ext/mysqlnd/mysqlnd_priv.h:1.4.2.6
--- php-src/ext/mysqlnd/mysqlnd_priv.h:1.4.2.5 Wed Jan 2 21:14:35 2008
+++ php-src/ext/mysqlnd/mysqlnd_priv.h Tue Jan 8 13:11:55 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_priv.h,v 1.4.2.5 2008/01/02 21:14:35 andrey Exp $ */
+/* $Id: mysqlnd_priv.h,v 1.4.2.6 2008/01/08 13:11:55 andrey Exp $ */
#ifndef MYSQLND_PRIV_H
#define MYSQLND_PRIV_H
@@ -143,7 +143,7 @@
{ \
error_info.error_no = 0; \
error_info.error[0] = '\0'; \
- strncpy(error_info.sqlstate, "00000", sizeof("00000") - 1); \
+ strlcpy(error_info.sqlstate, "00000",
sizeof(error_info.sqlstate)); \
}
#define SET_CLIENT_ERROR(error_info, a, b, c) \
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_result.h?r1=1.2.2.3&r2=1.2.2.4&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_result.h
diff -u php-src/ext/mysqlnd/mysqlnd_result.h:1.2.2.3
php-src/ext/mysqlnd/mysqlnd_result.h:1.2.2.4
--- php-src/ext/mysqlnd/mysqlnd_result.h:1.2.2.3 Mon Dec 31 07:17:11 2007
+++ php-src/ext/mysqlnd/mysqlnd_result.h Tue Jan 8 13:11:55 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_result.h,v 1.2.2.3 2007/12/31 07:17:11 sebastian Exp $ */
+/* $Id: mysqlnd_result.h,v 1.2.2.4 2008/01/08 13:11:55 andrey Exp $ */
#ifndef MYSQLND_RESULT_H
#define MYSQLND_RESULT_H
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_result_meta.h?r1=1.2.2.3&r2=1.2.2.4&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_result_meta.h
diff -u php-src/ext/mysqlnd/mysqlnd_result_meta.h:1.2.2.3
php-src/ext/mysqlnd/mysqlnd_result_meta.h:1.2.2.4
--- php-src/ext/mysqlnd/mysqlnd_result_meta.h:1.2.2.3 Mon Dec 31 07:17:11 2007
+++ php-src/ext/mysqlnd/mysqlnd_result_meta.h Tue Jan 8 13:11:55 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_result_meta.h,v 1.2.2.3 2007/12/31 07:17:11 sebastian Exp $ */
+/* $Id: mysqlnd_result_meta.h,v 1.2.2.4 2008/01/08 13:11:55 andrey Exp $ */
#ifndef MYSQLND_RESULT_META_H
#define MYSQLND_RESULT_META_H
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_statistics.h?r1=1.4.2.4&r2=1.4.2.5&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_statistics.h
diff -u php-src/ext/mysqlnd/mysqlnd_statistics.h:1.4.2.4
php-src/ext/mysqlnd/mysqlnd_statistics.h:1.4.2.5
--- php-src/ext/mysqlnd/mysqlnd_statistics.h:1.4.2.4 Wed Jan 2 21:14:35 2008
+++ php-src/ext/mysqlnd/mysqlnd_statistics.h Tue Jan 8 13:11:55 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_statistics.h,v 1.4.2.4 2008/01/02 21:14:35 andrey Exp $ */
+/* $Id: mysqlnd_statistics.h,v 1.4.2.5 2008/01/08 13:11:55 andrey Exp $ */
#ifndef MYSQLND_STATISTICS_H
#define MYSQLND_STATISTICS_H
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.4.2.4&r2=1.4.2.5&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.4
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.5
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.4.2.4 Wed Jan 2 21:14:35 2008
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c Tue Jan 8 13:11:55 2008
@@ -698,7 +698,7 @@
p+= 23;
len= strlen(packet->user);
- strncpy(p, packet->user, len);
+ memcpy(p, packet->user, len);
p+= len;
*p++ = '\0';
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.h?r1=1.4.2.4&r2=1.4.2.5&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.h
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.h:1.4.2.4
php-src/ext/mysqlnd/mysqlnd_wireprotocol.h:1.4.2.5
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.h:1.4.2.4 Wed Jan 2 21:14:35 2008
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.h Tue Jan 8 13:11:55 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_wireprotocol.h,v 1.4.2.4 2008/01/02 21:14:35 andrey Exp $ */
+/* $Id: mysqlnd_wireprotocol.h,v 1.4.2.5 2008/01/08 13:11:55 andrey Exp $ */
#ifndef MYSQLND_WIREPROTOCOL_H
#define MYSQLND_WIREPROTOCOL_H
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/php_mysqlnd.h?r1=1.2.2.3&r2=1.2.2.4&diff_format=u
Index: php-src/ext/mysqlnd/php_mysqlnd.h
diff -u php-src/ext/mysqlnd/php_mysqlnd.h:1.2.2.3
php-src/ext/mysqlnd/php_mysqlnd.h:1.2.2.4
--- php-src/ext/mysqlnd/php_mysqlnd.h:1.2.2.3 Mon Dec 31 07:17:11 2007
+++ php-src/ext/mysqlnd/php_mysqlnd.h Tue Jan 8 13:11:55 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: php_mysqlnd.h,v 1.2.2.3 2007/12/31 07:17:11 sebastian Exp $
+ $Id: php_mysqlnd.h,v 1.2.2.4 2008/01/08 13:11:55 andrey Exp $
*/
#ifndef PHP_MYSQLND_H
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
