gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix leak of set

Browse source
This commit is contained in:
Richard Frith-Macdonald 2021-01-18 12:20:46 +00:00
parent 925023e8c0
commit 72af51982f
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Source/NSKeyValueObserving.m
View file

@ -444,6 +444,11 @@ cifframe_callback(ffi_cif *cif, void *retp, void **args, void *user)
NSString *superName;
NSString *name;
if (nil == (self = [super init]))
{
return nil;
}
if ([aClass instanceMethodForSelector: @selector(takeValue:forKey:)]
!= [NSObject instanceMethodForSelector: @selector(takeValue:forKey:)])
{
@ -1298,8 +1303,13 @@ cifframe_callback(ffi_cif *cif, void *retp, void **args, void *user)
withTarget: (id)aTarget
context: (void *)context
{
NSString * remainingKeyPath;
NSRange dot;
NSString *remainingKeyPath;
NSRange dot;
if (nil == (self = [super init]))
{
return nil;
}
target = aTarget;
keyPathToForward = [keyPath copy];
@ -1485,6 +1495,7 @@ cifframe_callback(ffi_cif *cif, void *retp, void **args, void *user)
NSRange dot;
setup();
[kvoLock lock];
// Use the original class
@ -1891,7 +1902,9 @@ cifframe_callback(ffi_cif *cif, void *retp, void **args, void *user)
{
set = [self valueForKey: aKey];
}
[pathInfo->change setValue: [set mutableCopy] forKey: @"oldSet"];
set = [set mutableCopy];
[pathInfo->change setValue: set forKey: @"oldSet"];
RELEASE(set);
[pathInfo notifyForKey: aKey ofInstance: [info instance] prior: YES];
}
[info unlock];
@ -1921,7 +1934,7 @@ cifframe_callback(ffi_cif *cif, void *retp, void **args, void *user)
NSMutableSet *oldSet;
id set = objects;
oldSet = [pathInfo->change valueForKey: @"oldSet"];
oldSet = RETAIN([pathInfo->change valueForKey: @"oldSet"]);
if (nil == set)
{
set = [self valueForKey: aKey];
@ -1937,6 +1950,7 @@ cifframe_callback(ffi_cif *cif, void *retp, void **args, void *user)
forKey: NSKeyValueChangeKindKey];
[pathInfo->change setValue: set
forKey: NSKeyValueChangeNewKey];
RELEASE(set);
}
else if (mutationKind == NSKeyValueMinusSetMutation
|| mutationKind == NSKeyValueIntersectSetMutation)
@ -1964,8 +1978,10 @@ cifframe_callback(ffi_cif *cif, void *retp, void **args, void *user)
forKey: NSKeyValueChangeOldKey];
[pathInfo->change setValue: new
forKey: NSKeyValueChangeNewKey];
RELEASE(old);
RELEASE(new);
}
RELEASE(oldSet);
[pathInfo notifyForKey: aKey ofInstance: [info instance] prior: NO];
}
if (pathInfo->recursion > 0)