strncpy->strlcpy

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index a0a13208b97fe884c30d790e096237143d4fee53..2ee2244b18ab25d6787b3b8e5f87ff7f86b55d9a 100644 (file)
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -676,14 +676,14 @@ PHPAPI MYSQLND *mysqlnd_connect(MYSQLND *conn,
                } 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 {

diff --git a/ext/mysqlnd/mysqlnd_loaddata.c b/ext/mysqlnd/mysqlnd_loaddata.c
index 5e4b508629d10f76a3c99d9c1d3a20357297064f..02166ca210b025ae7eb1c295f808cd1f17bc2371 100644 (file)
--- a/ext/mysqlnd/mysqlnd_loaddata.c
+++ b/ext/mysqlnd/mysqlnd_loaddata.c
@@ -113,7 +113,7 @@ int mysqlnd_local_infile_error(void *ptr, char *error_buf, uint error_buf_len TS
        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);
        }

diff --git a/ext/mysqlnd/mysqlnd_priv.h b/ext/mysqlnd/mysqlnd_priv.h
index 3a206cb39c5085b1bde0ce2a767a3d28749f90cf..cf6424e49fba9b50fcb883f2a39d07041d2985d5 100644 (file)
--- a/ext/mysqlnd/mysqlnd_priv.h
+++ b/ext/mysqlnd/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) \

diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
index 8c119a769f33f8cf29813678026a8ad22501a114..5f1ee54b8899ddac71efacdd3a0b42c6bb1756c8 100644 (file)
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -698,7 +698,7 @@ size_t php_mysqlnd_auth_write(void *_packet, MYSQLND *conn TSRMLS_DC)
        p+= 23; 
 
        len= strlen(packet->user);
-       strncpy(p, packet->user, len);
+       memcpy(p, packet->user, len);
        p+= len;
        *p++ = '\0';