Libc-1082.50.1.tar.gz

diff --git a/locale/FreeBSD/gb18030.c b/locale/FreeBSD/gb18030.c
index 7a5fc7884667419abd4eafa0dacf5c83a16c46db..46624658710ee438937ddf794238b775bfc655d0 100644 (file)
--- a/locale/FreeBSD/gb18030.c
+++ b/locale/FreeBSD/gb18030.c
@@ -97,7 +97,7 @@ _GB18030_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s,
        }
 
        ncopy = MIN(MIN(n, GB18030_MB_CUR_MAX), sizeof(gs->bytes) - gs->count);
        }
 
        ncopy = MIN(MIN(n, GB18030_MB_CUR_MAX), sizeof(gs->bytes) - gs->count);

-       memcpy(gs->bytes + gs->count, s, ncopy);
+       strncpy(gs->bytes + gs->count, s, ncopy);

        ocount = gs->count;
        gs->count += ncopy;
        s = (char *)gs->bytes;
        ocount = gs->count;
        gs->count += ncopy;
        s = (char *)gs->bytes;

diff --git a/locale/FreeBSD/gb2312.c b/locale/FreeBSD/gb2312.c
index 28034214c22ad6862791d3409979a12f0a1659a8..559ada45e35cac1b8a43be0c86c5a2c25a089a8d 100644 (file)
--- a/locale/FreeBSD/gb2312.c
+++ b/locale/FreeBSD/gb2312.c
@@ -114,7 +114,7 @@ _GB2312_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
        }
 
        ncopy = MIN(MIN(n, GB2312_MB_CUR_MAX), sizeof(gs->bytes) - gs->count);
        }
 
        ncopy = MIN(MIN(n, GB2312_MB_CUR_MAX), sizeof(gs->bytes) - gs->count);

-       memcpy(gs->bytes + gs->count, s, ncopy);
+       strncpy(gs->bytes + gs->count, s, ncopy);

        ocount = gs->count;
        gs->count += ncopy;
        s = (char *)gs->bytes;
        ocount = gs->count;
        gs->count += ncopy;
        s = (char *)gs->bytes;