gnustep/libs-sqlclient
0
0
Fork 0
mirror of https://github.com/gnustep/libs-sqlclient.git synced 2025-02-11 08:30:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove instance from global tables in -release rather than -dealloc to avoid race condition where a deallocated instance could be retrieved from table.

Browse source
This commit is contained in:
rfm 2024-07-09 09:31:43 +01:00
parent 936410c7e6
commit 2c9070cfd0
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
SQLClient.m
View file

@ -1652,14 +1652,6 @@ static int poolConnections = 0;
{
NSNotificationCenter *nc;
[clientsLock lock];
NSHashRemove(clientsHash, (void*)self);
if (_name != nil
&& (SQLClient*)NSMapGet(clientsMap, (void*)_name) == self)
{
NSMapRemove(clientsMap, (void*)_name);
}
[clientsLock unlock];
nc = [NSNotificationCenter defaultCenter];
[nc removeObserver: self];
if (YES == connected) [self disconnect];
@ -2609,8 +2601,25 @@ static int poolConnections = 0;
}
else
{
[super release];
[clientsLock unlock];
/* If we are going to deallocate the object, we first remove
* it from global tables so that no other thread will find it
* and try to use it while it is being deallocated.
*/
if (NSDecrementExtraRefCountWasZero(self))
{
NSHashRemove(clientsHash, (void*)self);
if (_name != nil
&& (SQLClient*)NSMapGet(clientsMap, (void*)_name) == self)
{
NSMapRemove(clientsMap, (void*)_name);
}
[clientsLock unlock];
[self dealloc];
}
else
{
[clientsLock unlock];
}
}
}