String handling bugfix.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@13163 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2002-03-20 06:46:26 +00:00
parent ae92fb6e16
commit 437a7d68e5
2 changed files with 9 additions and 3 deletions

View file

@ -1,3 +1,8 @@
2002-03-20 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSString.m: lossyCString_u() handle case where cString
contains more bytes than unicode string has characters.
2002-03-19 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSString.m: lossyCString_c() fix in line with recent

View file

@ -1261,10 +1261,11 @@ lossyCString_c(ivars self)
static inline const char*
lossyCString_u(ivars self)
{
unsigned l = self->_count;
unsigned char *r = (unsigned char*)_fastMallocBuffer(l + 1);
unsigned l = 0;
unsigned char *r = 0;
GSFromUnicode(&r, &l, self->_contents.u, l, defEnc, 0, GSUniTerminate);
GSFromUnicode(&r, &l, self->_contents.u, self->_count, defEnc, 0,
GSUniTemporary|GSUniTerminate);
return (const char*)r;
}