Merge branch 'mandersen-ios6-empty-node-crash' into develop

odrobnik · odrobnik · commit feccd7269d73 · 2015-02-14T16:48:18.000+01:00
diff --git a/Core/Source/DTCoreTextParagraphStyle.m b/Core/Source/DTCoreTextParagraphStyle.m
@@ -43,7 +43,9 @@ + (DTCoreTextParagraphStyle *)paragraphStyleWithCTParagraphStyle:(CTParagraphSty
 #if DTCORETEXT_SUPPORT_NS_ATTRIBUTES
 + (DTCoreTextParagraphStyle *)paragraphStyleWithNSParagraphStyle:(NSParagraphStyle *)paragraphStyle
 {
-	NSParameterAssert(paragraphStyle);
+	if ( ! paragraphStyle) {
+		paragraphStyle = [NSParagraphStyle defaultParagraphStyle];
+	}
 	
 	DTCoreTextParagraphStyle *retStyle = [[DTCoreTextParagraphStyle alloc] init];
 	
diff --git a/Test/Source/NSAttributedStringHTMLTest.m b/Test/Source/NSAttributedStringHTMLTest.m
@@ -170,4 +170,16 @@ - (void)testAttributedStringColorToHTML
 }
  */
 
+- (void)testCrashAtEmptyNodeBeforeDivWithiOS6Attributes
+{
+	// This string is the simplest case that caused the crash.
+	NSString *html = @"<div><i></i><div></div></div>;";
+	NSData *data = [html dataUsingEncoding:NSUTF8StringEncoding];
+	NSDictionary *options = @{DTUseiOS6Attributes: @(YES)};
+	NSAttributedString *string = [[NSAttributedString alloc] initWithHTMLData:data
+																	  options:options
+														   documentAttributes:NULL];
+	XCTAssert(string != nil);
+}
+
 @end

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,9 @@ + (DTCoreTextParagraphStyle *)paragraphStyleWithCTParagraphStyle:(CTParagraphSty`
`43`	`43`	`#if DTCORETEXT_SUPPORT_NS_ATTRIBUTES`
`44`	`44`	`+ (DTCoreTextParagraphStyle )paragraphStyleWithNSParagraphStyle:(NSParagraphStyle )paragraphStyle`
`45`	`45`	`{`
`46`		`- NSParameterAssert(paragraphStyle);`
	`46`	`+ if ( ! paragraphStyle) {`
	`47`	`+ paragraphStyle = [NSParagraphStyle defaultParagraphStyle];`
	`48`	`+ }`
`47`	`49`
`48`	`50`	`DTCoreTextParagraphStyle *retStyle = [[DTCoreTextParagraphStyle alloc] init];`
`49`	`51`