Merge branch 'Krish-sysadmin-issue242'

tid-kijyun · Jul 16, 2021 · 48e0a76 · 48e0a76
2 parents 9732b7b + 82695dc
commit 48e0a76
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/Sources/Kanna/libxmlHTMLDocument.swift b/Sources/Kanna/libxmlHTMLDocument.swift
@@ -209,7 +209,7 @@ final class libxmlHTMLDocument: HTMLDocument {
             throw ParseError.EncodingMismatch
         }
 
-        rootNode = libxmlHTMLNode(document: self, docPtr: docPtr)
+        rootNode = try libxmlHTMLNode(document: self, docPtr: docPtr)
     }
 
     deinit {
@@ -299,7 +299,7 @@ final class libxmlXMLDocument: XMLDocument {
         }
         let url: String = ""
         docPtr   = cur.withUnsafeBytes { xmlReadDoc($0.bindMemory(to: xmlChar.self).baseAddress!, url, charsetName, CInt(option)) }
-        rootNode = libxmlHTMLNode(document: self, docPtr: docPtr!)
+        rootNode = try libxmlHTMLNode(document: self, docPtr: docPtr!)
     }
 
     deinit {

diff --git a/Sources/Kanna/libxmlHTMLNode.swift b/Sources/Kanna/libxmlHTMLNode.swift
@@ -138,10 +138,15 @@ final class libxmlHTMLNode: XMLElement {
         }
     }
 
-    init(document: XMLDocument?, docPtr: xmlDocPtr) {
+    init(document: XMLDocument?, docPtr: xmlDocPtr) throws {
         self.weakDocument = document
         self.docPtr       = docPtr
-        self.nodePtr      = xmlDocGetRootElement(docPtr)
+        guard let nodePtr = xmlDocGetRootElement(docPtr) else {
+            // Error handling is omitted, and will be added if necessary in the future.
+            // e.g: if let error = xmlGetLastError(), error.pointee.code == XML_ERR_DOCUMENT_EMPTY.rawValue
+            throw ParseError.Empty
+        }
+        self.nodePtr = nodePtr
     }
 
     init(document: XMLDocument?, docPtr: xmlDocPtr, node: xmlNodePtr) {

diff --git a/Tests/KannaTests/KannaHTMLTests.swift b/Tests/KannaTests/KannaHTMLTests.swift
@@ -153,6 +153,16 @@ class KannaHTMLTests: XCTestCase {
         XCTAssert(previous.text == "first")
     }
 
+    func testEmptyHTML() {
+        XCTAssertThrowsError(try HTML(html: "", encoding: .utf8)) { error in
+            XCTAssertEqual(error as? ParseError, ParseError.Empty)
+        }
+
+        XCTAssertThrowsError(try HTML(html: " ", encoding: .utf8)) { error in
+            XCTAssertEqual(error as? ParseError, ParseError.Empty)
+        }
+    }
+
     func testEscapeId() {
         let html = "<body><div id='my.id'>target</div><div>second</div><div>third</div></body>"
         guard let doc = try? HTML(html: html, encoding: .utf8),

diff --git a/Tests/KannaTests/KannaXMLTests.swift b/Tests/KannaTests/KannaXMLTests.swift
@@ -63,7 +63,13 @@ class KannaXMLTests: XCTestCase {
     }
 
     func testXmlThrows() {
-        XCTAssertThrowsError(try XML(xml: "", encoding: .utf8))
+        XCTAssertThrowsError(try XML(xml: "", encoding: .utf8)) { error in
+            XCTAssertEqual(error as? ParseError, ParseError.Empty)
+        }
+
+        XCTAssertThrowsError(try XML(xml: " ", encoding: .utf8)) { error in
+            XCTAssertEqual(error as? ParseError, ParseError.Empty)
+        }
     }
 
     func testNamespaces() {