mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-23 09:04:13 +00:00
Fix a problem removing certificate data mapped to file names.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@40085 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
85b02833b1
commit
e6cef4a7f9
2 changed files with 31 additions and 2 deletions
|
@ -1,3 +1,7 @@
|
|||
2016-09-16 Niels Grewe <niels.grewe@halbordnung.de>
|
||||
|
||||
* Source/GSTLS.m: Fix bug removing mapped certificates.
|
||||
|
||||
2016-09-06 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Headers/Foundation/NSScanner.h:
|
||||
|
|
|
@ -304,7 +304,16 @@ static NSMutableDictionary *fileMap = nil;
|
|||
format: @"[GSTLS+dataForTLSFile:] called with bad file name"];
|
||||
}
|
||||
[fileLock lock];
|
||||
result = [[fileMap objectForKey: fileName] retain];
|
||||
NS_DURING
|
||||
{
|
||||
result = [[fileMap objectForKey: fileName] retain];
|
||||
}
|
||||
NS_HANDLER
|
||||
{
|
||||
[fileLock unlock];
|
||||
[localException raise];
|
||||
}
|
||||
NS_ENDHANDLER
|
||||
[fileLock unlock];
|
||||
if (nil == result)
|
||||
{
|
||||
|
@ -369,7 +378,23 @@ static NSMutableDictionary *fileMap = nil;
|
|||
format: @"[GSTLS+setData:forTLSFile:] called with bad file"];
|
||||
}
|
||||
[fileLock lock];
|
||||
[fileMap setObject: data forKey: fileName];
|
||||
NS_DURING
|
||||
{
|
||||
if (data == nil)
|
||||
{
|
||||
[fileMap removeObjectForKey: fileName];
|
||||
}
|
||||
else
|
||||
{
|
||||
[fileMap setObject: data forKey: fileName];
|
||||
}
|
||||
}
|
||||
NS_HANDLER
|
||||
{
|
||||
[fileLock unlock];
|
||||
[localException raise];
|
||||
}
|
||||
NS_ENDHANDLER
|
||||
[fileLock unlock];
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue