d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Perform some basic validation of multibyte conversion state objects.

Browse Source
This commit is contained in:
Tim J. Robbins 2004-04-12 13:09:18 +00:00
parent 7cc35e41e7
commit fc813796d2
8 changed files with 116 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/libc/locale/big5.c
View File

@ -41,6 +41,7 @@ static char sccsid[] = "@(#)big5.c 8.1 (Berkeley) 6/4/93";
#include <sys/param.h>
__FBSDID("$FreeBSD$");
#include <errno.h>
#include <runetype.h>
#include <stdlib.h>
#include <string.h>
@ -100,6 +101,11 @@ _BIG5_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
bs = (_BIG5State *)ps;
if (bs->count < 0 || bs->count > sizeof(bs->bytes)) {
errno = EINVAL;
return ((size_t)-1);
}
if (s == NULL) {
s = "";
n = 1;
@ -127,9 +133,16 @@ _BIG5_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
}
size_t
_BIG5_wcrtomb(char * __restrict s, wchar_t wc,
mbstate_t * __restrict ps __unused)
_BIG5_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
{
_BIG5State *bs;
bs = (_BIG5State *)ps;
if (bs->count != 0) {
errno = EINVAL;
return ((size_t)-1);
}
if (s == NULL)
/* Reset to initial shift state (no-op) */

16
lib/libc/locale/euc.c
View File

@ -154,6 +154,11 @@ _EUC_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
es = (_EucState *)ps;
if (es->count < 0 || es->count > sizeof(es->bytes)) {
errno = EINVAL;
return ((size_t)-1);
}
if (s == NULL) {
s = "";
n = 1;
@ -192,12 +197,19 @@ _EUC_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
}
size_t
_EUC_wcrtomb(char * __restrict s, wchar_t wc,
mbstate_t * __restrict ps __unused)
_EUC_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
{
_EucState *es;
wchar_t m, nm;
int i, len;
es = (_EucState *)ps;
if (es->count != 0) {
errno = EINVAL;
return ((size_t)-1);
}
if (s == NULL)
/* Reset to initial shift state (no-op) */
return (1);

16
lib/libc/locale/gb18030.c
View File

@ -85,6 +85,11 @@ _GB18030_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s,
gs = (_GB18030State *)ps;
if (gs->count < 0 || gs->count > sizeof(gs->bytes)) {
errno = EINVAL;
return ((size_t)-1);
}
if (s == NULL) {
s = "";
n = 1;
@ -154,12 +159,19 @@ _GB18030_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s,
}
size_t
_GB18030_wcrtomb(char * __restrict s, wchar_t wc,
mbstate_t * __restrict ps __unused)
_GB18030_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
{
_GB18030State *gs;
size_t len;
int c;
gs = (_GB18030State *)ps;
if (gs->count != 0) {
errno = EINVAL;
return ((size_t)-1);
}
if (s == NULL)
/* Reset to initial shift state (no-op) */
return (1);

17
lib/libc/locale/gb2312.c
View File

@ -28,6 +28,7 @@
#include <sys/param.h>
__FBSDID("$FreeBSD$");
#include <errno.h>
#include <runetype.h>
#include <stdlib.h>
#include <string.h>
@ -102,6 +103,11 @@ _GB2312_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
gs = (_GB2312State *)ps;
if (gs->count < 0 || gs->count > sizeof(gs->bytes)) {
errno = EINVAL;
return ((size_t)-1);
}
if (s == NULL) {
s = "";
n = 1;
@ -128,9 +134,16 @@ _GB2312_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
}
size_t
_GB2312_wcrtomb(char * __restrict s, wchar_t wc,
mbstate_t * __restrict ps __unused)
_GB2312_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
{
_GB2312State *gs;
gs = (_GB2312State *)ps;
if (gs->count != 0) {
errno = EINVAL;
return ((size_t)-1);
}
if (s == NULL)
/* Reset to initial shift state (no-op) */

17
lib/libc/locale/gbk.c
View File

@ -38,6 +38,7 @@
#include <sys/param.h>
__FBSDID("$FreeBSD$");
#include <errno.h>
#include <runetype.h>
#include <stdlib.h>
#include <string.h>
@ -97,6 +98,11 @@ _GBK_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
gs = (_GBKState *)ps;
if (gs->count < 0 || gs->count > sizeof(gs->bytes)) {
errno = EINVAL;
return ((size_t)-1);
}
if (s == NULL) {
s = "";
n = 1;
@ -124,9 +130,16 @@ _GBK_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
}
size_t
_GBK_wcrtomb(char * __restrict s, wchar_t wc,
mbstate_t * __restrict ps __unused)
_GBK_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
{
_GBKState *gs;
gs = (_GBKState *)ps;
if (gs->count != 0) {
errno = EINVAL;
return ((size_t)-1);
}
if (s == NULL)
/* Reset to initial shift state (no-op) */

17
lib/libc/locale/mskanji.c
View File

@ -39,6 +39,7 @@ static char sccsid[] = "@(#)mskanji.c 1.0 (Phase One) 5/5/95";
#include <sys/param.h>
__FBSDID("$FreeBSD$");
#include <errno.h>
#include <runetype.h>
#include <stdlib.h>
#include <string.h>
@ -90,6 +91,11 @@ _MSKanji_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
ms = (_MSKanjiState *)ps;
if (ms->count < 0 || ms->count > sizeof(ms->bytes)) {
errno = EINVAL;
return ((size_t)-1);
}
if (s == NULL) {
s = "";
n = 1;
@ -122,11 +128,18 @@ _MSKanji_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
}
size_t
_MSKanji_wcrtomb(char * __restrict s, wchar_t wc,
mbstate_t * __restrict ps __unused)
_MSKanji_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
{
_MSKanjiState *ms;
int len, i;
ms = (_MSKanjiState *)ps;
if (ms->count != 0) {
errno = EINVAL;
return ((size_t)-1);
}
if (s == NULL)
/* Reset to initial shift state (no-op) */
return (1);

16
lib/libc/locale/utf2.c
View File

@ -91,6 +91,11 @@ _UTF2_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
us = (_UTF2State *)ps;
if (us->count < 0 || us->count > sizeof(us->bytes)) {
errno = EINVAL;
return ((size_t)-1);
}
if (s == NULL) {
s = "";
n = 1;
@ -142,12 +147,19 @@ _UTF2_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
}
size_t
_UTF2_wcrtomb(char * __restrict s, wchar_t wc,
mbstate_t * __restrict ps __unused)
_UTF2_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
{
_UTF2State *us;
unsigned char lead;
int i, len;
us = (_UTF2State *)ps;
if (us->count != 0) {
errno = EINVAL;
return ((size_t)-1);
}
if (s == NULL)
/* Reset to initial conversion state. */
return (1);

16
lib/libc/locale/utf8.c
View File

@ -79,6 +79,11 @@ _UTF8_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
us = (_UTF8State *)ps;
if (us->count < 0 || us->count > sizeof(us->bytes)) {
errno = EINVAL;
return ((size_t)-1);
}
if (s == NULL) {
s = "";
n = 1;
@ -176,12 +181,19 @@ _UTF8_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
}
size_t
_UTF8_wcrtomb(char * __restrict s, wchar_t wc,
mbstate_t * __restrict ps __unused)
_UTF8_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
{
_UTF8State *us;
unsigned char lead;
int i, len;
us = (_UTF8State *)ps;
if (us->count < 0 || us->count > sizeof(us->bytes)) {
errno = EINVAL;
return ((size_t)-1);
}
if (s == NULL)
/* Reset to initial shift state (no-op) */
return (1);