1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wb_wc and wc_mb now checks length inside

Browse Source
This commit is contained in:
unknown 2003-01-27 16:46:03 +04:00
parent ecb55f4307
commit e7660c64d7
11 changed files with 55 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/item_strfunc.cc
View File

@ -2014,9 +2014,8 @@ String *Item_func_conv_charset::val_str(String *str)
d0=d=(unsigned char*)str->ptr();
de=d+dmaxlen;
while (s < se && d < de)
while (1)
{
cnvres=from->mb_wc(from,&wc,s,se);
if (cnvres>0)
{
@ -2089,8 +2088,8 @@ String *Item_func_conv_charset3::val_str(String *str)
d0=d=(unsigned char*)str->ptr();
de=d+dmaxlen;
while (s < se && d < de){
while (1)
{
cnvres=from_charset->mb_wc(from_charset,&wc,s,se);
if (cnvres>0)
{

2
sql/sql_string.cc
View File

@ -706,7 +706,7 @@ copy_and_convert(char *to, uint32 to_length, CHARSET_INFO *to_cs,
char *to_start= to;
uchar *to_end= (uchar*) to+to_length;
while ((uchar*) from < from_end)
while (1)
{
if ((cnvres=from_cs->mb_wc(from_cs, &wc, (uchar*) from, from_end)) > 0)
from+= cnvres;

6
strings/ctype-big5.c
View File

@ -6175,6 +6175,9 @@ my_wc_mb_big5(CHARSET_INFO *cs __attribute__((unused)),
int code;
if (s >= e)
return MY_CS_TOOSMALL;
if(wc<0x80)
{
s[0]=wc;
@ -6200,6 +6203,9 @@ my_mb_wc_big5(CHARSET_INFO *cs __attribute__((unused)),
int hi=s[0];
if (s >= e)
return MY_CS_TOOFEW(0);
if(hi<0x80)
{
pwc[0]=hi;

6
strings/ctype-bin.c
View File

@ -96,6 +96,9 @@ static int my_mb_wc_bin(CHARSET_INFO *cs __attribute__((unused)),
const unsigned char *str,
const unsigned char *end __attribute__((unused)))
{
if (str >= end)
return MY_CS_TOOFEW(0);
*wc=str[0];
return 1;
}
@ -105,6 +108,9 @@ static int my_wc_mb_bin(CHARSET_INFO *cs __attribute__((unused)),
unsigned char *s,
unsigned char *e __attribute__((unused)))
{
if (s >= e)
return MY_CS_TOOSMALL;
if (wc < 256)
{
s[0]= (char) wc;

6
strings/ctype-euc_kr.c
View File

@ -8593,6 +8593,9 @@ my_wc_mb_euc_kr(CHARSET_INFO *cs __attribute__((unused)),
{
int code;
if (s >= e)
return MY_CS_TOOSMALL;
if (wc<0x80)
{
s[0]=wc;
@ -8618,6 +8621,9 @@ my_mb_wc_euc_kr(CHARSET_INFO *cs __attribute__((unused)),
int hi=s[0];
if (s >= e)
return MY_CS_TOOFEW(0);
if (hi<0x80)
{
pwc[0]=hi;

6
strings/ctype-gb2312.c
View File

@ -5643,6 +5643,9 @@ my_wc_mb_gb2312(CHARSET_INFO *cs __attribute__((unused)),
{
int code;
if (s >= e)
return MY_CS_TOOSMALL;
if (wc<0x80)
{
s[0]=wc;
@ -5668,6 +5671,9 @@ my_mb_wc_gb2312(CHARSET_INFO *cs __attribute__((unused)),
hi=s[0];
if (s >= e)
return MY_CS_TOOFEW(0);
if(hi<0x80)
{
pwc[0]=hi;

6
strings/ctype-gbk.c
View File

@ -9829,6 +9829,9 @@ my_wc_mb_gbk(CHARSET_INFO *cs __attribute__((unused)),
{
int code;
if (s >= e)
return MY_CS_TOOSMALL;
if (wc<0x80)
{
s[0]=wc;
@ -9852,6 +9855,9 @@ my_mb_wc_gbk(CHARSET_INFO *cs __attribute__((unused)),
{
int hi;
if (s >= e)
return MY_CS_TOOFEW(0);
hi=s[0];
if (hi<0x80)

6
strings/ctype-simple.c
View File

@ -106,6 +106,9 @@ int my_mb_wc_8bit(CHARSET_INFO *cs,my_wc_t *wc,
const unsigned char *str,
const unsigned char *end __attribute__((unused)))
{
if (str >= end)
return MY_CS_TOOFEW(0);
*wc=cs->tab_to_uni[*str];
return (!wc[0] && str[0]) ? MY_CS_ILSEQ : 1;
}
@ -116,6 +119,9 @@ int my_wc_mb_8bit(CHARSET_INFO *cs,my_wc_t wc,
{
MY_UNI_IDX *idx;
if (str >= end)
return MY_CS_TOOSMALL;
for (idx=cs->tab_from_uni; idx->tab ; idx++)
{
if (idx->from <= wc && idx->to >= wc)

6
strings/ctype-sjis.c
View File

@ -4420,6 +4420,9 @@ my_wc_mb_sjis(CHARSET_INFO *cs __attribute__((unused)),
{
int code;
if (s >= e)
return MY_CS_TOOSMALL;
if(wc<0x80)
{
s[0]=wc;
@ -4442,6 +4445,9 @@ my_mb_wc_sjis(CHARSET_INFO *cs __attribute__((unused)),
my_wc_t *pwc, const uchar *s, const uchar *e){
int hi=s[0];
if (s >= e)
return MY_CS_TOOFEW(0);
if(hi<0x80)
{
pwc[0]=hi;

3
strings/ctype-ujis.c
View File

@ -8350,6 +8350,9 @@ my_wc_mb_euc_jp(CHARSET_INFO *c,my_wc_t wc, unsigned char *s, unsigned char *e)
unsigned char buf[2];
unsigned char c1;
int ret,jp;
if (s >= e)
return MY_CS_TOOSMALL;
if (wc<0x80)
{

6
strings/ctype-utf8.c
View File

@ -1586,6 +1586,9 @@ static int my_utf8_uni (CHARSET_INFO *cs __attribute__((unused)) ,
{
unsigned char c = s[0];
if (s >= e)
return MY_CS_TOOFEW(0);
if (c < 0x80)
{
*pwc = c;
@ -1688,6 +1691,9 @@ static int my_uni_utf8 (CHARSET_INFO *cs __attribute__((unused)) ,
{
int count;
if (r >= e)
return MY_CS_TOOSMALL;
if (wc < 0x80)
count = 1;
else if (wc < 0x800)