修复iOS/OSX平台下function中返回元组带有nil时发生异常问题

vimfung · Nov 5, 2019 · 601dc24 · 601dc24
1 parent 39019dc
commit 601dc24
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Source/iOS_OSX/Code/LSCTuple.m b/Source/iOS_OSX/Code/LSCTuple.m
@@ -28,12 +28,18 @@ - (NSInteger)count
 
 - (void)addReturnValue:(id)returnValue
 {
+    if (!returnValue)
+    {
+        returnValue = [NSNull null];
+    }
+
     [self.returnValues addObject:returnValue];
 }
 
 - (id)returnValueForIndex:(NSInteger)index
 {
-    return self.returnValues[index];
+    id retVal = self.returnValues[index];
+    return [retVal isKindOfClass:[NSNull class]] ? nil : retVal;
 }
 
 - (NSString *)description