andrey Tue Jan 8 13:13:39 2008 UTC
Modified files:
/php-src/ext/mysqlnd mysqlnd.c mysqlnd.h mysqlnd_loaddata.c
mysqlnd_priv.h mysqlnd_result.c
mysqlnd_structs.h mysqlnd_wireprotocol.c
Log:
strncpy->strlcpy
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.9&r2=1.10&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.9 php-src/ext/mysqlnd/mysqlnd.c:1.10
--- php-src/ext/mysqlnd/mysqlnd.c:1.9 Wed Jan 2 21:16:46 2008
+++ php-src/ext/mysqlnd/mysqlnd.c Tue Jan 8 13:13:39 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd.c,v 1.9 2008/01/02 21:16:46 andrey Exp $ */
+/* $Id: mysqlnd.c,v 1.10 2008/01/08 13:13:39 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.h?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.h
diff -u php-src/ext/mysqlnd/mysqlnd.h:1.5 php-src/ext/mysqlnd/mysqlnd.h:1.6
--- php-src/ext/mysqlnd/mysqlnd.h:1.5 Wed Jan 2 21:16:46 2008
+++ php-src/ext/mysqlnd/mysqlnd.h Tue Jan 8 13:13:39 2008
@@ -18,12 +18,12 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd.h,v 1.5 2008/01/02 21:16:46 andrey Exp $ */
+/* $Id: mysqlnd.h,v 1.6 2008/01/08 13:13:39 andrey Exp $ */
#ifndef MYSQLND_H
#define MYSQLND_H
-#define MYSQLND_VERSION "mysqlnd 5.0.2-dev - 070928 - $Revision: 1.5 $"
+#define MYSQLND_VERSION "mysqlnd 5.0.2-dev - 070928 - $Revision: 1.6 $"
#define MYSQLND_VERSION_ID 50002
/* This forces inlining of some accessor functions */
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_loaddata.c?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_loaddata.c
diff -u php-src/ext/mysqlnd/mysqlnd_loaddata.c:1.3
php-src/ext/mysqlnd/mysqlnd_loaddata.c:1.4
--- php-src/ext/mysqlnd/mysqlnd_loaddata.c:1.3 Mon Dec 31 07:12:12 2007
+++ php-src/ext/mysqlnd/mysqlnd_loaddata.c Tue Jan 8 13:13:39 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_priv.h?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_priv.h
diff -u php-src/ext/mysqlnd/mysqlnd_priv.h:1.7
php-src/ext/mysqlnd/mysqlnd_priv.h:1.8
--- php-src/ext/mysqlnd/mysqlnd_priv.h:1.7 Wed Jan 2 21:16:46 2008
+++ php-src/ext/mysqlnd/mysqlnd_priv.h Tue Jan 8 13:13:39 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_priv.h,v 1.7 2008/01/02 21:16:46 andrey Exp $ */
+/* $Id: mysqlnd_priv.h,v 1.8 2008/01/08 13:13:39 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.c?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_result.c
diff -u php-src/ext/mysqlnd/mysqlnd_result.c:1.8
php-src/ext/mysqlnd/mysqlnd_result.c:1.9
--- php-src/ext/mysqlnd/mysqlnd_result.c:1.8 Wed Jan 2 21:16:46 2008
+++ php-src/ext/mysqlnd/mysqlnd_result.c Tue Jan 8 13:13:39 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_result.c,v 1.8 2008/01/02 21:16:46 andrey Exp $ */
+/* $Id: mysqlnd_result.c,v 1.9 2008/01/08 13:13:39 andrey Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_wireprotocol.h"
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_structs.h?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_structs.h
diff -u php-src/ext/mysqlnd/mysqlnd_structs.h:1.5
php-src/ext/mysqlnd/mysqlnd_structs.h:1.6
--- php-src/ext/mysqlnd/mysqlnd_structs.h:1.5 Thu Jan 3 11:38:03 2008
+++ php-src/ext/mysqlnd/mysqlnd_structs.h Tue Jan 8 13:13:39 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_structs.h,v 1.5 2008/01/03 11:38:03 andrey Exp $ */
+/* $Id: mysqlnd_structs.h,v 1.6 2008/01/08 13:13:39 andrey Exp $ */
#ifndef MYSQLND_STRUCTS_H
#define MYSQLND_STRUCTS_H
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_wireprotocol.c?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_wireprotocol.c
diff -u php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.6
php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.7
--- php-src/ext/mysqlnd/mysqlnd_wireprotocol.c:1.6 Wed Jan 2 21:16:46 2008
+++ php-src/ext/mysqlnd/mysqlnd_wireprotocol.c Tue Jan 8 13:13:39 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';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
