mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-30 00:11:26 +00:00
(GSToUnicode, GSFromUnicode): Fix setting of dst in some cases.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@17176 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
ea152c1c5e
commit
eb078bc0f9
2 changed files with 18 additions and 3 deletions
|
@ -1330,6 +1330,7 @@ tables:
|
|||
NSZoneFree(zone, ptr);
|
||||
}
|
||||
ptr = r;
|
||||
*dst = ptr;
|
||||
}
|
||||
else if (zone != 0 && (ptr == buf || bsize > dpos))
|
||||
{
|
||||
|
@ -1354,13 +1355,17 @@ tables:
|
|||
{
|
||||
ptr = NSZoneRealloc(zone, ptr, bytes);
|
||||
}
|
||||
*dst = ptr;
|
||||
}
|
||||
else if (ptr == buf)
|
||||
{
|
||||
ptr = NULL;
|
||||
result = NO;
|
||||
}
|
||||
*dst = ptr;
|
||||
else
|
||||
{
|
||||
*dst = ptr;
|
||||
}
|
||||
}
|
||||
else if (ptr != buf && dst != 0 && ptr != *dst)
|
||||
{
|
||||
|
@ -1976,6 +1981,10 @@ tables:
|
|||
ptr = NULL;
|
||||
result = NO;
|
||||
}
|
||||
else
|
||||
{
|
||||
*dst = ptr;
|
||||
}
|
||||
}
|
||||
else if (ptr != buf && dst != 0 && ptr != *dst)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue