From ffad49b40b8514d1c6ebcf5ab5a976f3deb359d4 Mon Sep 17 00:00:00 2001 From: rfm Date: Thu, 17 Feb 2011 06:55:50 +0000 Subject: [PATCH] fixup memory allocation problem git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32197 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ Source/NSDateFormatter.m | 4 +--- Source/NSNumberFormatter.m | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6b6efeb4..c2af7f71a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-02-16 Richard Frith-Macdonald + + * Source/NSDateFormatter.m: + * Source/NSNumberFormatter.m: + Fix -initWithCoder: methods to create internal ivar storage. + 2011-02-16 Richard Frith-Macdonald * Source/NSFileManager.m: diff --git a/Source/NSDateFormatter.m b/Source/NSDateFormatter.m index 7757f4548..1ef9c8bd9 100644 --- a/Source/NSDateFormatter.m +++ b/Source/NSDateFormatter.m @@ -242,9 +242,7 @@ static NSDateFormatterBehavior _defaultBehavior = 0; - (id) initWithCoder: (NSCoder*)aCoder { - self = [super initWithCoder: aCoder]; - if (self == nil) - return nil; + GS_CREATE_INTERNAL(NSDateFormatter) [aCoder decodeValuesOfObjCTypes: "@C", &_dateFormat, &_allowsNaturalLanguage]; return self; diff --git a/Source/NSNumberFormatter.m b/Source/NSNumberFormatter.m index 3cf702a77..2931ba2cb 100644 --- a/Source/NSNumberFormatter.m +++ b/Source/NSNumberFormatter.m @@ -471,6 +471,8 @@ static NSUInteger _defaultBehavior = 0; - (id) initWithCoder: (NSCoder*)decoder { + GS_CREATE_INTERNAL(NSNumberFormatter) + if ([decoder allowsKeyedCoding]) { if ([decoder containsValueForKey: @"NS.allowsfloats"])