From: kosako Date: Mon, 18 Apr 2016 05:21:08 +0000 (+0900) Subject: define xstrncy() for strncpy_s() X-Git-Tag: v6.0.0^2~43 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=743ac0aa2932970f071df6136285529aaa36e600;p=onig define xstrncy() for strncpy_s() --- diff --git a/src/regposerr.c b/src/regposerr.c index c6db2e2..fc71eee 100644 --- a/src/regposerr.c +++ b/src/regposerr.c @@ -44,8 +44,10 @@ #if defined(_WIN32) && !defined(__GNUC__) #define xsnprintf sprintf_s +#define xstrncpy(dest,src,size) strncpy_s(dest,size,src,_TRUNCATE) #else #define xsnprintf snprintf +#define xstrncpy strncpy #endif static char* ESTRING[] = { @@ -96,7 +98,7 @@ regerror(int posix_ecode, const regex_t* reg ARG_UNUSED, char* buf, len = strlen(s) + 1; /* use strlen() because s is ascii encoding. */ if (buf != NULL && size > 0) { - strncpy(buf, s, size - 1); + xstrncpy(buf, s, size - 1); buf[size - 1] = '\0'; } return len;