From ff237b7b90862010078d08466934f3f237d7dded Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 13 Oct 2009 14:04:02 +0000 Subject: [PATCH] Monotone-Parent: 2af7febd00f4cf3a006ceaf8864e1965236a5511 Monotone-Revision: ae9bb8c02977fbcbedcef40778d6fffefd1fb58c Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-10-13T14:04:02 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 11 +++++++++++ SoObjects/Mailer/SOGoMailObject+Draft.m | 2 +- UI/Common/UIxAclEditor.m | 5 ++++- UI/Common/UIxPageFrame.m | 2 ++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f2a1aec8..013f0ab23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2009-10-13 Wolfgang Sourdeau + + * SoObjects/Mailer/SOGoMailObject+Draft.m (-contentForEditing): + "keys" must be autoreleased to avoid a leak. + + * UI/Common/UIxAclEditor.m (-setUserUIDs): we need to retain the + array of user ids to avoid a zombie. + + * UI/Common/UIxPageFrame.m (-dealloc): we release + additionalCSSFiles to avoid a leak. + 2009-10-12 Ludovic Marcotte * Updated patchset to support properly windows-1250 diff --git a/SoObjects/Mailer/SOGoMailObject+Draft.m b/SoObjects/Mailer/SOGoMailObject+Draft.m index c6e7983ba..5b94238f8 100644 --- a/SoObjects/Mailer/SOGoMailObject+Draft.m +++ b/SoObjects/Mailer/SOGoMailObject+Draft.m @@ -155,7 +155,7 @@ acceptedTypes = [NSArray arrayWithObjects: @"text/plain", @"text/html", nil]; - keys = [NSMutableArray new]; + keys = [NSMutableArray array]; [self addRequiredKeysOfStructure: [self bodyStructure] path: @"" toArray: keys acceptedTypes: acceptedTypes]; diff --git a/UI/Common/UIxAclEditor.m b/UI/Common/UIxAclEditor.m index b6eba3805..128ffa06e 100644 --- a/UI/Common/UIxAclEditor.m +++ b/UI/Common/UIxAclEditor.m @@ -161,7 +161,10 @@ - (void) setUserUIDS: (NSString *) retainedUsers { if ([retainedUsers length] > 0) - savedUIDs = [retainedUsers componentsSeparatedByString: @","]; + { + savedUIDs = [retainedUsers componentsSeparatedByString: @","]; + [savedUIDs retain]; + } else savedUIDs = [NSArray new]; } diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m index a9ee3fbdc..346612382 100644 --- a/UI/Common/UIxPageFrame.m +++ b/UI/Common/UIxPageFrame.m @@ -53,6 +53,7 @@ static NSString *siteFavicon = nil; title = nil; toolbar = nil; additionalJSFiles = nil; + additionalCSSFiles = nil; } return self; @@ -64,6 +65,7 @@ static NSString *siteFavicon = nil; [title release]; [toolbar release]; [additionalJSFiles release]; + [additionalCSSFiles release]; [super dealloc]; }