AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 19:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

In conversion to ISO-2022-JP, add two missing buffer size checks.

Browse Source
This commit is contained in:
Ulrich Drepper 2000-08-23 06:59:33 +00:00
parent 7e7b6007f2
commit 87f6057a31
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
iconvdata/iso-2022-jp.c
View File

@ -577,6 +577,12 @@ gconv_end (struct __gconv_step *data)
{ \ { \
if (set2 == ISO88591_set) \ if (set2 == ISO88591_set) \
{ \ { \
if (__builtin_expect (outptr + 3 > outend, 0)) \
{ \
result = __GCONV_FULL_OUTPUT; \
break; \
} \
\
if (ch >= 0x80 && ch <= 0xff) \ if (ch >= 0x80 && ch <= 0xff) \
{ \ { \
*outptr++ = ESC; \ *outptr++ = ESC; \
@ -596,6 +602,12 @@ gconv_end (struct __gconv_step *data)
unsigned char res = iso88597_from_ucs4[ch - 0xa0 + rp->idx]; \ unsigned char res = iso88597_from_ucs4[ch - 0xa0 + rp->idx]; \
if (res != '\0') \ if (res != '\0') \
{ \ { \
if (__builtin_expect (outptr + 3 > outend, 0)) \
{ \
result = __GCONV_FULL_OUTPUT; \
break; \
} \
\
*outptr++ = ESC; \ *outptr++ = ESC; \
*outptr++ = 'N'; \ *outptr++ = 'N'; \
*outptr++ = res; \ *outptr++ = res; \