Fix crash if data was not serializable by NSJSONSerialization (#34)

linkedin · Oct 5, 2016 · 214b9f5 · 214b9f5
1 parent 38dbc8d
commit 214b9f5
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/LayoutTest/TestCase/LYTLayoutFailingTestSnapshotRecorder.m b/LayoutTest/TestCase/LYTLayoutFailingTestSnapshotRecorder.m
@@ -183,9 +183,13 @@ - (void)appendViewWithWidth:(CGFloat)width
     NSString *imagePath = [NSString stringWithFormat:@"%@/%@", [self methodNameForInvocation:invocation], [self nameForImageWithWidth:width height:height data:data]];
     NSString *dataDescription = nil;
     if (data) {
-        NSData *serializedJSON = [NSJSONSerialization dataWithJSONObject:data options:NSJSONWritingPrettyPrinted error:nil];
-        if (serializedJSON) {
-            dataDescription = [[NSString alloc] initWithData:serializedJSON encoding:NSUTF8StringEncoding];
+        if ([NSJSONSerialization isValidJSONObject:data])  {
+            NSData *serializedJSON = [NSJSONSerialization dataWithJSONObject:data options:NSJSONWritingPrettyPrinted error:nil];
+            if (serializedJSON) {
+                dataDescription = [[NSString alloc] initWithData:serializedJSON encoding:NSUTF8StringEncoding];
+            }
+        } else {
+            dataDescription = [data description];
         }
     }
     NSString *errorHTML = [NSString stringWithFormat:@"<TR><TD>%@</TD><TD><IMG src='%@' alt='No Image'></TD><TD>%@</TD></TR>", [description lyt_stringByAddingXMLEscaping], imagePath, dataDescription];