diff options
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | strings/my_vsnprintf.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/strings/CMakeLists.txt b/strings/CMakeLists.txt index dd9b500841f..ac7c75ec56c 100644 --- a/strings/CMakeLists.txt +++ b/strings/CMakeLists.txt @@ -24,4 +24,4 @@ ADD_LIBRARY(strings bchange.c bcmp.c bfill.c bmove512.c bmove_upp.c ctype-big5.c is_prefix.c llstr.c longlong2str.c my_strtoll10.c my_vsnprintf.c r_strinstr.c str2int.c str_alloc.c strcend.c strend.c strfill.c strmake.c strmov.c strnmov.c strtod.c strtol.c strtoll.c strtoul.c strtoull.c strxmov.c strxnmov.c xml.c - my_strchr.c strcont.c strinstr.c) + my_strchr.c strcont.c strinstr.c strnlen.c) diff --git a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c index 9fdbfa1fa89..a57cc5b5ebe 100644 --- a/strings/my_vsnprintf.c +++ b/strings/my_vsnprintf.c @@ -97,8 +97,7 @@ size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap) reg2 char *par = va_arg(ap, char *); size_t plen,left_len = (size_t) (end - to) + 1; if (!par) par = (char*)"(null)"; - plen= strlen(par); - set_if_smaller(plen,width); + plen= (uint) strnlen(par, width); if (left_len <= plen) plen = left_len - 1; to=strnmov(to,par,plen); |