ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-22 12:28:11 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

handle non-ASCII strings properly in MyClasspath::makeString

Browse Source
This commit is contained in:
Joel Dice 2013-04-09 18:44:54 -06:00
parent dca75df926
commit 2c902a26ec
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/classpath-openjdk.cpp
View File

@ -504,7 +504,23 @@ class MyClasspath : public Classpath {
object charArray = makeCharArray(t, length);
for (int i = 0; i < length; ++i) {
expect(t, (byteArrayBody(t, array, offset + i) & 0x80) == 0);
if (byteArrayBody(t, array, offset + i) & 0x80) {
object constructor = resolveMethod
(t, type(t, Machine::StringType), "<init>",
"([BIILjava/lang/String;)V");
PROTECT(t, constructor);
object utf8 = vm::makeString(t, "UTF8");
PROTECT(t, utf8);
object s = makeNew(t, type(t, Machine::StringType));
PROTECT(t, s);
t->m->processor->invoke
(t, constructor, s, array, offset, length, utf8);
return s;
}
charArrayBody(t, charArray, i) = byteArrayBody(t, array, offset + i);
}