gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix possible free of non heasp memory

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32435 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2011-03-03 08:14:02 +00:00
parent 08d2cd3313
commit 0448c6e620
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,7 +1,12 @@
2011-03-03 Richard Frith-Macdonald <rfm@gnu.org>
* Source/Additions/Unicode.m: Review memory management ... fix possible
free of non-heap memory.
2011-03-02 Riccardo Mottola <rm@gnu.org>
* base/NSNumberFormatter/basic.m:
Add test cor checking leading zeroes in fractional part.
Add test for checking leading zeroes in fractional part.
2011-03-02 Richard Frith-Macdonald <rfm@gnu.org>

14
Source/Additions/Unicode.m
View file

@ -304,7 +304,8 @@ static void GSSetupEncodingTable(void)
}
}
}
encTable = NSZoneMalloc(NSDefaultMallocZone(),(encTableSize+1)*sizeof(struct _strenc_ *));
encTable = NSZoneMalloc(NSDefaultMallocZone(),
(encTableSize+1)*sizeof(struct _strenc_ *));
memset(encTable, 0, (encTableSize+1)*sizeof(struct _strenc_ *));
/*
@ -328,7 +329,8 @@ static void GSSetupEncodingTable(void)
/*
* See if we can do a lossy conversion.
*/
lossy = NSZoneMalloc(NSDefaultMallocZone(),strlen(entry->iconv) + 12);
lossy = NSZoneMalloc(NSDefaultMallocZone(),
strlen(entry->iconv) + 12);
strcpy(lossy, entry->iconv);
strcat(lossy, "//TRANSLIT");
c = iconv_open(UNICODE_ENC, entry->iconv);
@ -472,8 +474,8 @@ GSEncodingForRegistry (NSString *registry, NSString *encoding)
* deduced from the clocale string itself. If clocale isn't set or
* no match can be found, returns GSUndefinedEncoding.
*/
/* It would be really nice if this could be used in +defaultCStringEncoding, but
* there are too many dependancies on other parts of the library to
/* It would be really nice if this could be used in +defaultCStringEncoding,
* but there are too many dependancies on other parts of the library to
* make this practical (even if everything possible was written in C,
* we'd still need some way to find the Locale.encodings file).
*/
@ -1485,7 +1487,7 @@ done:
}
}
#if !GS_WITH_GC
else if (ptr != buf && (dst == 0 || ptr != *dst))
else if (ptr != buf && dst != 0 && ptr != *dst)
{
NSZoneFree(zone, ptr);
}
@ -2482,7 +2484,7 @@ iconv_start:
}
}
#if !GS_WITH_GC
else if (ptr != buf && (dst == 0 || ptr != *dst))
else if (ptr != buf && (dst != 0 || ptr != *dst))
{
NSZoneFree(zone, ptr);
}