Merge pull request #831 from facebook/ASCIICrash

appleguy · appleguy · commit 3d6ba66c35ba · 2015-11-08T19:18:12.000-08:00
Fix crash in ASCII art creator for one-element children arrays.
diff --git a/AsyncDisplayKit/Layout/ASLayoutSpec.mm b/AsyncDisplayKit/Layout/ASLayoutSpec.mm
@@ -150,7 +150,8 @@ + (NSString *)asciiArtStringForChildren:(NSArray *)children parentName:(NSString
 
 - (NSString *)asciiArtString
 {
-  return [ASLayoutSpec asciiArtStringForChildren:@[self.child] parentName:[self asciiArtName]];
+  NSArray *children = self.child ? @[self.child] : self.children;
+  return [ASLayoutSpec asciiArtStringForChildren:children parentName:[self asciiArtName]];
 }
 
 - (NSString *)asciiArtName

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,8 @@ + (NSString )asciiArtStringForChildren:(NSArray )children parentName:(NSString`
`150`	`150`
`151`	`151`	`- (NSString *)asciiArtString`
`152`	`152`	`{`
`153`		`- return [ASLayoutSpec asciiArtStringForChildren:@[self.child] parentName:[self asciiArtName]];`
	`153`	`+ NSArray *children = self.child ? @[self.child] : self.children;`
	`154`	`+ return [ASLayoutSpec asciiArtStringForChildren:children parentName:[self asciiArtName]];`
`154`	`155`	`}`
`155`	`156`
`156`	`157`	`- (NSString *)asciiArtName`