解决alloc、new、copy、mutableCopy调用后内存泄漏的问题

SilverFruity · Jan 5, 2021 · fb65865 · fb65865
1 parent e151e31
commit fb65865
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 34 deletions.
diff --git a/OCRunner/RunnerClasses+Execute.m b/OCRunner/RunnerClasses+Execute.m
@@ -509,7 +509,6 @@ - (nullable MFValue *)execute:(MFScopeChain *)scope {
         return [MFValue voidValue];
     }
     NSUInteger argCount = [sig numberOfArguments];
-    void *retValuePointer = alloca([sig methodReturnLength]);
     //解决多参数调用问题
     if (argValues.count + 2 > argCount && sig != nil) {
         NSMutableArray *methodArgs = [@[[MFValue valueWithObject:instance],
@@ -520,6 +519,8 @@ - (nullable MFValue *)execute:(MFScopeChain *)scope {
         invoke_functionPointer(msg_send, methodArgs, result, argCount);
         return result;
     }else{
+        void *retValuePointer = alloca([sig methodReturnLength]);
+        char *returnType = (char *)[sig methodReturnType];
         NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:sig];
         invocation.target = instance;
         invocation.selector = sel;
@@ -531,22 +532,19 @@ - (nullable MFValue *)execute:(MFScopeChain *)scope {
         }
         // func replaceIMP execute
         [invocation invoke];
-        char *returnType = (char *)[sig methodReturnType];
         returnType = removeTypeEncodingPrefix(returnType);
         if (*returnType == 'v') {
             return [MFValue voidValue];
         }
         [invocation getReturnValue:retValuePointer];
+        MFValue *value = [[MFValue alloc] initTypeEncode:returnType pointer:retValuePointer];
+        // 针对一下方法调用，需要和CF一样，最终都要release. 与JSPatch和Mango中的__bridge_transfer效果相同
+        if (sel == @selector(alloc) || sel == @selector(new)||
+            sel == @selector(copy) || sel == @selector(mutableCopy)) {
+            CFRelease(*(void **)retValuePointer);
+        }
+        return value;
     }
-    const char * returnType = [sig methodReturnType];
-    NSString *selectorName = NSStringFromSelector(sel);
-    if ([selectorName isEqualToString:@"alloc"] || [selectorName isEqualToString:@"new"] ||
-        [selectorName isEqualToString:@"copy"] || [selectorName isEqualToString:@"mutableCopy"]) {
-        return [[MFValue alloc] initTypeEncode:returnType pointer:retValuePointer];
-    }else{
-        return [[MFValue alloc] initTypeEncode:returnType pointer:retValuePointer];
-    }
-
 }
 @end
 @implementation ORCFuncCall(Execute)

diff --git a/OCRunnerDemo/OCRunnerDemo/AppDelegate.m b/OCRunnerDemo/OCRunnerDemo/AppDelegate.m
@@ -17,32 +17,9 @@ @interface AppDelegate ()
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-#if DEBUG
     NSString *binaryPatchFilePath = [[NSBundle mainBundle] pathForResource:@"binarypatch" ofType:nil];
     NSString *jsonPatchFilePath = [[NSBundle mainBundle] pathForResource:@"jsonpatch" ofType:nil];
-#else
-    NSURL *serverFileUrl = [NSURL URLWithString:@"http://127.0.0.1:8086/binarypatch"];
-    NSString *patchFilePath = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES).firstObject;
-    patchFilePath = [patchFilePath stringByAppendingPathComponent:@"BinaryPatchFile"];
-    NSMutableURLRequest *req = [NSMutableURLRequest requestWithURL:serverFileUrl];
-    req.timeoutInterval = 5;
-    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-    [[[NSURLSession sharedSession] downloadTaskWithRequest:req completionHandler:^(NSURL * _Nullable location, NSURLResponse * _Nullable response, NSError * _Nullable error) {
-        NSURL *dest = [NSURL fileURLWithPath:patchFilePath];
-        if ([[NSFileManager defaultManager] fileExistsAtPath:dest.path]) {
-            [[NSFileManager defaultManager] replaceItemAtURL:dest withItemAtURL:location backupItemName:nil options:0 resultingItemURL:nil error:&error];
-        }else{
-            [[NSFileManager defaultManager] moveItemAtURL:location toURL:dest error:&error];
-        }
-        if (error) {
-            NSLog(@"%@",error);
-        }
-        dispatch_semaphore_signal(semaphore);
-    }] resume] ;
-    dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
-#endif
     [ORInterpreter excuteBinaryPatchFile:binaryPatchFilePath];
-
     [ORInterpreter excuteJsonPatchFile:jsonPatchFilePath];
 
 #if __x86_64__  &&  TARGET_OS_SIMULATOR  &&  !TARGET_OS_IOSMAC