Author: ahristov
Date: 2008-01-08 14:36:13 +0100 (Tue, 08 Jan 2008)
New Revision: 1193
Modified:
branches/experimental/mysqlnd/mysqlnd.c
branches/experimental/mysqlnd/mysqlnd.h
branches/experimental/mysqlnd/mysqlnd_charset.c
branches/experimental/mysqlnd/mysqlnd_charset.h
branches/experimental/mysqlnd/mysqlnd_loaddata.c
branches/experimental/mysqlnd/mysqlnd_priv.h
branches/experimental/mysqlnd/mysqlnd_result.c
branches/experimental/mysqlnd/mysqlnd_structs.h
branches/experimental/mysqlnd/mysqlnd_wireprotocol.c
Log:
strncpy->strlcpy
Modified: branches/experimental/mysqlnd/mysqlnd.c
===================================================================
--- branches/experimental/mysqlnd/mysqlnd.c 2008-01-08 13:35:51 UTC (rev 1192)
+++ branches/experimental/mysqlnd/mysqlnd.c 2008-01-08 13:36:13 UTC (rev 1193)
@@ -896,14 +896,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 {
@@ -1186,7 +1186,7 @@
/* {{{ mysqlnd_old_escape_string */
-PHPAPI ulong mysqlnd_old_escape_string(char *newstr, const char *escapestr, int
escapestr_len TSRMLS_DC)
+PHPAPI ulong mysqlnd_old_escape_string(char *newstr, const char *escapestr, size_t
escapestr_len TSRMLS_DC)
{
DBG_ENTER("mysqlnd_old_escape_string");
DBG_RETURN(mysqlnd_cset_escape_slashes(mysqlnd_find_charset_name("latin1"),
@@ -1198,7 +1198,7 @@
/* {{{ mysqlnd_conn::escape_string */
static ulong
MYSQLND_METHOD(mysqlnd_conn, escape_string)(const MYSQLND * const conn, char *newstr,
- const char *escapestr, int escapestr_len TSRMLS_DC)
+ const char *escapestr, size_t escapestr_len TSRMLS_DC)
{
DBG_ENTER("mysqlnd_conn::escape_string");
DBG_INF_FMT("conn=%llu", conn->thread_id);
Modified: branches/experimental/mysqlnd/mysqlnd.h
===================================================================
--- branches/experimental/mysqlnd/mysqlnd.h 2008-01-08 13:35:51 UTC (rev 1192)
+++ branches/experimental/mysqlnd/mysqlnd.h 2008-01-08 13:36:13 UTC (rev 1193)
@@ -240,7 +240,7 @@
#define mysqlnd_escape_string(newstr, escapestr, escapestr_len) \
mysqlnd_old_escape_string((newstr), (escapestr), (escapestr_len) TSRMLS_CC)
-PHPAPI ulong mysqlnd_old_escape_string(char *newstr, const char *escapestr, int
escapestr_len TSRMLS_DC);
+PHPAPI ulong mysqlnd_old_escape_string(char *newstr, const char *escapestr, size_t
escapestr_len TSRMLS_DC);
/* PS */
Modified: branches/experimental/mysqlnd/mysqlnd_charset.c
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_charset.c 2008-01-08 13:35:51 UTC (rev 1192)
+++ branches/experimental/mysqlnd/mysqlnd_charset.c 2008-01-08 13:36:13 UTC (rev 1193)
@@ -463,7 +463,7 @@
/* {{{ mysqlnd_cset_escape_quotes */
PHPAPI ulong mysqlnd_cset_escape_quotes(const MYSQLND_CHARSET * const cset, char *newstr,
- const char *escapestr, int escapestr_len TSRMLS_DC)
+ const char *escapestr, size_t escapestr_len TSRMLS_DC)
{
const char *newstr_s = newstr;
const char *newstr_e = newstr + 2 * escapestr_len;
@@ -517,7 +517,7 @@
/* {{{ mysqlnd_cset_escape_slashes */
PHPAPI ulong mysqlnd_cset_escape_slashes(const MYSQLND_CHARSET * const cset, char
*newstr,
- const char *escapestr, int escapestr_len TSRMLS_DC)
+ const char *escapestr, size_t escapestr_len TSRMLS_DC)
{
const char *newstr_s = newstr;
const char *newstr_e = newstr + 2 * escapestr_len;
Modified: branches/experimental/mysqlnd/mysqlnd_charset.h
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_charset.h 2008-01-08 13:35:51 UTC (rev 1192)
+++ branches/experimental/mysqlnd/mysqlnd_charset.h 2008-01-08 13:36:13 UTC (rev 1193)
@@ -19,10 +19,10 @@
*/
PHPAPI ulong mysqlnd_cset_escape_quotes(const MYSQLND_CHARSET * const charset, char
*newstr,
- const char *escapestr, int escapestr_len TSRMLS_DC);
+ const char *escapestr, size_t escapestr_len TSRMLS_DC);
PHPAPI ulong mysqlnd_cset_escape_slashes(const MYSQLND_CHARSET * const cset, char
*newstr,
- const char *escapestr, int escapestr_len TSRMLS_DC);
+ const char *escapestr, size_t escapestr_len TSRMLS_DC);
/*
Modified: branches/experimental/mysqlnd/mysqlnd_loaddata.c
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_loaddata.c 2008-01-08 13:35:51 UTC (rev 1192)
+++ branches/experimental/mysqlnd/mysqlnd_loaddata.c 2008-01-08 13:36:13 UTC (rev 1193)
@@ -113,12 +113,12 @@
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);
}
- strncpy(error_buf, "Unknown error", error_buf_len);
+ strlcpy(error_buf, "Unknown error", error_buf_len);
DBG_INF_FMT("no info, %d", CR_UNKNOWN_ERROR);
DBG_RETURN(CR_UNKNOWN_ERROR);
}
Modified: branches/experimental/mysqlnd/mysqlnd_priv.h
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_priv.h 2008-01-08 13:35:51 UTC (rev 1192)
+++ branches/experimental/mysqlnd/mysqlnd_priv.h 2008-01-08 13:36:13 UTC (rev 1193)
@@ -143,14 +143,14 @@
{ \
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) \
{ \
error_info.error_no = a; \
- strncpy(error_info.sqlstate, b, sizeof(error_info.sqlstate)); \
- strncpy(error_info.error, c, sizeof(error_info.error)); \
+ strlcpy(error_info.sqlstate, b, sizeof(error_info.sqlstate)); \
+ strlcpy(error_info.error, c, sizeof(error_info.error)); \
}
#define SET_STMT_ERROR(stmt, a, b, c) SET_CLIENT_ERROR(stmt->error_info, a, b, c)
Modified: branches/experimental/mysqlnd/mysqlnd_result.c
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_result.c 2008-01-08 13:35:51 UTC (rev 1192)
+++ branches/experimental/mysqlnd/mysqlnd_result.c 2008-01-08 13:36:13 UTC (rev 1193)
@@ -558,7 +558,7 @@
static
unsigned long * mysqlnd_fetch_lengths_buffered(MYSQLND_RES * const result)
{
- int i;
+ unsigned int i;
zval **previous_row;
MYSQLND_RES_BUFFERED *set = result->stored_data;
Modified: branches/experimental/mysqlnd/mysqlnd_structs.h
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_structs.h 2008-01-08 13:35:51 UTC (rev 1192)
+++ branches/experimental/mysqlnd/mysqlnd_structs.h 2008-01-08 13:36:13 UTC (rev 1193)
@@ -235,7 +235,7 @@
struct st_mysqlnd_conn_methods
{
- ulong (*escape_string)(const MYSQLND * const conn, char *newstr, const char
*escapestr, int escapestr_len TSRMLS_DC);
+ ulong (*escape_string)(const MYSQLND * const conn, char *newstr, const char
*escapestr, size_t escapestr_len TSRMLS_DC);
enum_func_status (*set_charset)(MYSQLND * const conn, const char * const charset
TSRMLS_DC);
enum_func_status (*query)(MYSQLND *conn, const char *query, unsigned int query_len
TSRMLS_DC);
MYSQLND_RES * (*use_result)(MYSQLND * const conn TSRMLS_DC);
Modified: branches/experimental/mysqlnd/mysqlnd_wireprotocol.c
===================================================================
--- branches/experimental/mysqlnd/mysqlnd_wireprotocol.c 2008-01-08 13:35:51 UTC (rev
1192)
+++ branches/experimental/mysqlnd/mysqlnd_wireprotocol.c 2008-01-08 13:36:13 UTC (rev
1193)
@@ -697,7 +697,7 @@
p+= 23;
len= strlen(packet->user);
- strncpy(p, packet->user, len);
+ memcpy(p, packet->user, len);
p+= len;
*p++ = '\0';
| Thread |
|---|
| • PHP mysqlnd svn commit: r1193 - branches/experimental/mysqlnd | ahristov | 8 Jan |
