suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix _string/utf-16 terminator handling

Browse Source
This commit is contained in:
Matthew Flatt 2010-09-20 08:57:27 -06:00
parent dca6b3a06e
commit 55d3647965
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/foreign/foreign.c
View File

@ -482,8 +482,9 @@ static unsigned short *ucs4_string_to_utf16_pointer(Scheme_Object *ucs)
long ulen;
unsigned short *res;
res = scheme_ucs4_to_utf16
(SCHEME_CHAR_STR_VAL(ucs), 0, 1+SCHEME_CHAR_STRLEN_VAL(ucs),
NULL, -1, &ulen, 0);
(SCHEME_CHAR_STR_VAL(ucs), 0, SCHEME_CHAR_STRLEN_VAL(ucs),
NULL, -1, &ulen, 1);
res[ulen] = 0;
return res;
}
@ -500,7 +501,8 @@ Scheme_Object *utf16_pointer_to_ucs4_string(unsigned short *utf)
int end;
if (!utf) return scheme_false;
for (end=0; utf[end] != 0; end++) { /**/ }
res = scheme_utf16_to_ucs4(utf, 0, end, NULL, -1, &ulen, 0);
res = scheme_utf16_to_ucs4(utf, 0, end, NULL, -1, &ulen, 1);
res[ulen] = 0;
return scheme_make_sized_char_string(res, ulen, 0);
}

8
src/foreign/foreign.rktc
View File

@ -396,8 +396,9 @@ static unsigned short *ucs4_string_to_utf16_pointer(Scheme_Object *ucs)
long ulen;
unsigned short *res;
res = scheme_ucs4_to_utf16
(SCHEME_CHAR_STR_VAL(ucs), 0, 1+SCHEME_CHAR_STRLEN_VAL(ucs),
NULL, -1, &ulen, 0);
(SCHEME_CHAR_STR_VAL(ucs), 0, SCHEME_CHAR_STRLEN_VAL(ucs),
NULL, -1, &ulen, 1);
res[ulen] = 0;
return res;
}
@ -414,7 +415,8 @@ Scheme_Object *utf16_pointer_to_ucs4_string(unsigned short *utf)
int end;
if (!utf) return scheme_false;
for (end=0; utf[end] != 0; end++) { /**/ }
res = scheme_utf16_to_ucs4(utf, 0, end, NULL, -1, &ulen, 0);
res = scheme_utf16_to_ucs4(utf, 0, end, NULL, -1, &ulen, 1);
res[ulen] = 0;
return scheme_make_sized_char_string(res, ulen, 0);
}