BUGFIX: Solve the use after free problem caused by early release of r…

…eturn value
SilverFruity · Aug 15, 2024 · a355b01 · a355b01
1 parent 93bc2d0
commit a355b01
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/OCRunner/ORCoreImp/ORCoreImp.m b/OCRunner/ORCoreImp/ORCoreImp.m
@@ -62,7 +62,7 @@ void methodIMP(ffi_cif *cfi,void *ret,void **args, void*userdata){
     ctx.isDeallocScope = sel == NSSelectorFromString(@"dealloc");
     scope.entryCtx = ctx;
 
-    MFValue *returnValue = nil;
+    __autoreleasing MFValue *returnValue = nil;
     [ORArgsStack push:argValues];
     returnValue = [methodImp execute:scope];
     if (returnValue.type != TypeVoid && returnValue.pointer != NULL){
@@ -97,7 +97,7 @@ void blockInter(ffi_cif *cfi,void *ret,void **args, void*userdata){
         MFValue *argValue = [[MFValue alloc] initTypeEncode:[sig getArgumentTypeAtIndex:i] pointer:args[i]];
         [argValues addObject:argValue];
     }
-    MFValue *value = nil;
+    __autoreleasing MFValue *value = nil;
     [ORArgsStack push:argValues];
     value = [mangoBlock.func execute:mangoBlock.outScope];
     if (value.type != TypeVoid && value.pointer != NULL){

diff --git a/OCRunner/RunnerClasses+Execute.m b/OCRunner/RunnerClasses+Execute.m
@@ -373,7 +373,7 @@ typedef NS_OPTIONS(NSUInteger, UIControlState) {\n\
                 if (key && value){
                     dict[key] = value;
                 }else{
-                    NSLog(@"OCRunner Error: the key %@ or value %@ of NSDictionary can't be nil", key?:@"", value?:@"");
+                    NSLog(@"OCRunner Error: the key '%@' or value '%@' of NSDictionary can't be nil", key?:@"null", value?:@"null");
                 }
             }
             return [MFValue valueWithObject:[dict copy]];