From 0067c58c4bc0d44827aff49dd42d0cf1b75dff4e Mon Sep 17 00:00:00 2001 From: Richard Frith-MacDonald Date: Thu, 25 Jan 2007 04:24:15 +0000 Subject: [PATCH] Fix potential deadlock git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24412 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/NSUserDefaults.m | 1 + 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index c45de9a0f..4612edc6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-01-25 Richard Frith-Macdonald + + * Source/NSUserDefaults.m: fix failure to unlock thread lock when + unabel to obtain filesystem lock. + 2007-01-23 Adam Fedor * Source/NSObject.m ([NSObject +initialize]): Apply BSD FPU fix diff --git a/Source/NSUserDefaults.m b/Source/NSUserDefaults.m index 467e1148d..5bc99b330 100644 --- a/Source/NSUserDefaults.m +++ b/Source/NSUserDefaults.m @@ -1454,6 +1454,7 @@ static BOOL isLocked = NO; if ([self lockDefaultsFile: &wasLocked] == NO) { + [_lock unlock]; return NO; }