infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-25 01:30:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

7200277: [parfait] potential buffer overflow in npt/utf.c

Browse Source 
Reviewed-by: dsamersoff, dcubed
This commit is contained in:
Staffan Larsen 2013-09-20 16:40:32 +02:00
parent e5fa00ffb5
commit fdef74ade2
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jdk/src/share/npt/utf.c
View File

@ -105,18 +105,24 @@ utf16ToUtf8m(struct UtfInst *ui, unsigned short *utf16, int len, jbyte *output,
code = utf16[i];
if ( code >= 0x0001 && code <= 0x007F ) {
if ( outputLen + 1 >= outputMaxLen ) {
return -1;
}
output[outputLen++] = code;
} else if ( code == 0 || ( code >= 0x0080 && code <= 0x07FF ) ) {
if ( outputLen + 2 >= outputMaxLen ) {
return -1;
}
output[outputLen++] = ((code>>6) & 0x1F) | 0xC0;
output[outputLen++] = (code & 0x3F) | 0x80;
} else if ( code >= 0x0800 && code <= 0xFFFF ) {
if ( outputLen + 3 >= outputMaxLen ) {
return -1;
}
output[outputLen++] = ((code>>12) & 0x0F) | 0xE0;
output[outputLen++] = ((code>>6) & 0x3F) | 0x80;
output[outputLen++] = (code & 0x3F) | 0x80;
}
if ( outputLen > outputMaxLen ) {
return -1;
}
}
output[outputLen] = 0;
return outputLen;
@ -412,12 +418,15 @@ bytesToPrintable(struct UtfInst *ui, char *bytes, int len, char *output, int out
unsigned byte;
byte = bytes[i];
if ( outputLen >= outputMaxLen ) {
return -1;
}
if ( byte <= 0x7f && isprint(byte) && !iscntrl(byte) ) {
if ( outputLen + 1 >= outputMaxLen ) {
return -1;
}
output[outputLen++] = (char)byte;
} else {
if ( outputLen + 4 >= outputMaxLen ) {
return -1;
}
(void)sprintf(output+outputLen,"\\x%02x",byte);
outputLen += 4;
}