adium/adium

Patch from Jeff Mahoney to fix a crash when closing the Novell Groupwise account options. Fixes #16041.
adium-1.5.2
2012-06-20, Robert Vehse
122e8edb9c89
Parents d78e9b1cdc69
Children 82f8f5b935a4
Patch from Jeff Mahoney to fix a crash when closing the Novell Groupwise account options. Fixes #16041.

"While trying to change the port number for my Novell Groupwise account, Adium crashed consistently when the account options window was closed.

I tracked it down to a double release of view_setup which, at least for Groupwise, is the same as view_options. Releasing them separately caused a problem later with the autorelease was later processed.

This patch only frees both if they are different values."
3 files changed, 9 insertions(+), 2 deletions(-)
  • +6 -1
    ChangeLogs/Changes.txt
  • +1 -0
    Copyright.txt
  • +2 -1
    Frameworks/Adium Framework/Source/AIAccountViewController.m
    • --- a/ChangeLogs/Changes.txt Mon Jun 11 11:17:12 2012 +0200
    +++ b/ChangeLogs/Changes.txt Wed Jun 20 22:55:37 2012 +0200
    @@ -1,6 +1,10 @@
    Adium Version History
    -----------------------
    -Version 1.5.1
    +Version 1.5.2 (X/X/X)
    + * Fixed crash when closing the Novell Groupwise account options. (#16041)
    +
    +
    +Version 1.5.1 (6/7/2012)
    * Adium is now securely signed with an Apple Developer ID for OS X 10.8 / GateKeeper compatibility.
    * Updated to libpurple 2.10.4
    * AIM/ICQ: Fixed communication with buddies containing periods and underscores.
    @@ -18,6 +22,7 @@
    * Fixed alphabetical contact list sorting involving diacritics such as "å" and "ä" (Rafael Glauber) (#12678)
    * Made "View Release Notes" localizable. (#15914)
    +
    Version 1.5 (3/15/2012)
    Major changes
    * Requires Mac OS X 10.6.8 or later.
    --- a/Copyright.txt Mon Jun 11 11:17:12 2012 +0200
    +++ b/Copyright.txt Wed Jun 20 22:55:37 2012 +0200
    @@ -72,6 +72,7 @@
    Paul R. Livesey
    Daniel Ljungborg
    Casey Lutz
    +Jeff Mahoney
    Sam McCandlish
    Pietro Modi
    Nicola Del Monaco
    --- a/Frameworks/Adium Framework/Source/AIAccountViewController.m Mon Jun 11 11:17:12 2012 +0200
    +++ b/Frameworks/Adium Framework/Source/AIAccountViewController.m Wed Jun 20 22:55:37 2012 +0200
    @@ -94,7 +94,8 @@
    {
    [view_setup release];
    [view_profile release];
    - [view_options release];
    + if (view_setup != view_options)
    + [view_options release];
    [changedPrefDict release];
    [[NSNotificationCenter defaultCenter] removeObserver:self];