Fixed #32 innerHTML causes EXC_BAD_ACCESS

tid-kijyun · Sep 3, 2015 · 69018cf · 69018cf
1 parent c50ef52
commit 69018cf
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 15 deletions.
diff --git a/Source/libxml/libxmlHTMLNode.swift b/Source/libxml/libxmlHTMLNode.swift
@@ -43,11 +43,12 @@ internal final class libxmlHTMLNode: XMLElement {
     }
 
     var innerHTML: String? {
-        var html: String = ""
-        html += libxmlGetNodeText(nodePtr.memory.children) ?? ""
-        html += self.xpath(".//*").first?.toHTML ?? ""
-        html += libxmlGetNodeText(xmlGetLastChild(nodePtr)) ?? ""
-        return html
+        if let html = self.toHTML {
+            let inner = html.stringByReplacingOccurrencesOfString("</.*>$", withString: "", options: .RegularExpressionSearch, range: nil)
+                            .stringByReplacingOccurrencesOfString("^<.*>", withString: "", options: .RegularExpressionSearch, range: nil)
+            return inner
+        }
+        return nil
     }
 
     var className: String? {
@@ -162,16 +163,6 @@ internal final class libxmlHTMLNode: XMLElement {
     }
 }
 
-private func libxmlGetNodeText(nodePtr: xmlNodePtr) -> String? {
-    if nodePtr != nil {
-        let type = nodePtr.memory.type
-        if type.value == XML_TEXT_NODE.value {
-            return libxmlGetNodeText(nodePtr)
-        }
-    }
-    return nil
-}
-
 private func libxmlGetNodeContent(nodePtr: xmlNodePtr) -> String? {
     let content = xmlNodeGetContent(nodePtr)
     if let result  = String.fromCString(UnsafePointer(content)) {

diff --git a/Tests/KannaTests.swift b/Tests/KannaTests.swift
@@ -173,4 +173,15 @@ class KannaTests: XCTestCase {
             XCTAssert(false, "File not found. name: (\(filename))")
         }
     }
+
+    func testInnerHTML() {
+        let filename = "test_HTML4"
+        if let path = NSBundle(forClass:self.classForCoder).pathForResource(filename, ofType:"html"),
+            html = NSString(contentsOfFile: path, encoding: NSUTF8StringEncoding, error: nil) as? String,
+            doc = HTML(html: html, encoding: NSUTF8StringEncoding) {
+
+            XCTAssert(doc.at_css("div#inner")!.innerHTML == "\n        abc<div>def</div>hij<span>klmn</span>opq\n    ")
+            XCTAssert(doc.at_css("#asd")!.innerHTML == "asd")
+        }
+    }
 }
diff --git a/Tests/test_HTML4.html b/Tests/test_HTML4.html
@@ -64,5 +64,10 @@ <h2>header2</h2>
         <tr><td>Swift-HTML-Parser</td><td>100</td></tr>
       </tbody>
     </table>
+
+    <div id="inner">
+        abc<div>def</div>hij<span>klmn</span>opq
+    </div>
+    <div id="asd">asd</div>
   </body>
 </html>