gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix memory leak

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@11571 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2001-11-30 07:30:37 +00:00
parent faffa601c9
commit 9e67421578
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2001-11-29 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSScanner.m: Fix memory leak when initialised with something
other than a constant string.
2001-11-28 Adam Fedor <fedor@gnu.org>
* Documentation/gsdoc/Base.gsdoc: Add NSLanguages summary.

10
Source/NSScanner.m
View file

@ -52,6 +52,7 @@ static Class GSUnicodeStringClass;
static Class GSMutableStringClass;
static Class GSPlaceholderStringClass;
static Class NSConstantStringClass;
static id *_holder;
static NSCharacterSet *defaultSkipSet;
static SEL memSel;
@ -92,6 +93,7 @@ typedef struct {
GSMutableStringClass = [GSMutableString class];
GSPlaceholderStringClass = [GSPlaceholderString class];
NSConstantStringClass = [NSString constantStringClass];
_holder = (id)NSAllocateObject(GSPlaceholderStringClass, 0, 0);
}
}
@ -147,17 +149,16 @@ typedef struct {
}
else if (GSObjCIsKindOf(c, GSMutableStringClass) == YES)
{
_string = (id)NSAllocateObject(GSPlaceholderStringClass, 0, 0);
if (((ivars)aString)->_flags.wide == 1)
{
_isUnicode = YES;
_string = [_string initWithCharacters: ((ivars)aString)->_contents.u
_string = [_holder initWithCharacters: ((ivars)aString)->_contents.u
length: ((ivars)aString)->_count];
}
else
{
_isUnicode = NO;
_string = [_string initWithCString: ((ivars)aString)->_contents.c
_string = [_holder initWithCString: ((ivars)aString)->_contents.c
length: ((ivars)aString)->_count];
}
}
@ -169,8 +170,7 @@ typedef struct {
else if ([aString isKindOfClass: NSStringClass])
{
_isUnicode = YES;
_string = (id)NSAllocateObject(GSPlaceholderStringClass, 0, 0);
_string = [_string initWithString: aString];
_string = [_holder initWithString: aString];
}
else
{