Added check for NSNull pointer types being assigned by json parsing f…

…rameworks, if they work alongside autocoding.
nicklockwood · Jul 3, 2015 · 718754e · 718754e
1 parent 7fe31ee
commit 718754e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/AutoCoding/AutoCoding.m b/AutoCoding/AutoCoding.m
@@ -256,7 +256,7 @@ - (void)setWithCoder:(NSCoder *)aDecoder
         }
         if (object)
         {
-            if (secureSupported && ![object isKindOfClass:propertyClass])
+            if (secureSupported && ![object isKindOfClass:propertyClass] && object != [NSNull null])
             {
                 [NSException raise:AutocodingException format:@"Expected '%@' to be a %@, but was actually a %@", key, propertyClass, [object class]];
             }

diff --git a/Tests/UnitTests/DataTests.m b/Tests/UnitTests/DataTests.m
@@ -9,7 +9,6 @@
 #import "TestObject.h"
 #import "AutoCoding.h"
 
-
 @interface DataTests : XCTestCase
 
 @end
@@ -48,6 +47,18 @@ - (void)testOutputEqualsInput
     XCTAssertNotEqualObjects(output.readonlyDynamicProperty, input.readonlyDynamicProperty);
 }
 
+- (void)testNullObjectRetention {
+    TestObject *input = [[TestObject alloc] init];
+    [input setValue:[NSNull null] forKey:@"publicString"];
+    //save object
+    NSData *data = [NSKeyedArchiver archivedDataWithRootObject:input];
+
+    //load object
+    TestObject *output = [NSKeyedUnarchiver unarchiveObjectWithData:data];
+    XCTAssertEqualObjects(output.publicString, [NSNull null]);
+
+}
+
 - (void)testSecureCoding
 {
     //create object