Skip to content

Fix crash that occurs when attempting to retrieve the name property of an XMLDocument by making it return nil. #2453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 22 commits into from
Closed

Fix crash that occurs when attempting to retrieve the name property of an XMLDocument by making it return nil. #2453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
dd8dade
Made methods in CFSocketStream consistent in style
Jul 31, 2019
41993ac
Fixed whitespace
Jul 31, 2019
ac98255
Fixed
Jul 31, 2019
94b80c5
More refactoring
Jul 31, 2019
8a3ff0f
More refactoring
Jul 31, 2019
77c8ed2
Update CoreFoundation/Stream.subproj/CFSocketStream.c
Aug 1, 2019
a566398
Fixed Indentation
Aug 1, 2019
d092bb4
Revert "Fixed Indentation"
Aug 3, 2019
a71d65c
Revert "Update CoreFoundation/Stream.subproj/CFSocketStream.c"
Aug 3, 2019
6b96bc6
Revert "More refactoring"
Aug 3, 2019
11da9e4
Revert "More refactoring"
Aug 3, 2019
91c746e
Revert "Fixed"
Aug 3, 2019
3bf6719
Revert "Fixed whitespace"
Aug 3, 2019
06485ff
Revert "Made methods in CFSocketStream consistent in style"
Aug 3, 2019
aae75a8
Fix for crash when attempting to retrieve name for XMLDocument
Aug 3, 2019
0d00083
Update CFXMLInterface.c
Aug 4, 2019
32d6203
Update CFXMLInterface.c
Aug 10, 2019
dfc64d9
Update CFXMLInterface.c
Aug 10, 2019
9b22e2d
Fix
Aug 10, 2019
50130f2
Fix
Aug 10, 2019
51b54f9
Ingore document in Foundation
Aug 10, 2019
2a578e2
Merge branch 'master' into master
Aug 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions CoreFoundation/Parsing.subproj/CFXMLInterface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,6 @@ void _CFXMLNodeSetPrivateData(_CFXMLNodePtr node, void* data) {
if (!node) {
return;
}

((xmlNodePtr)node)->_private = data;
}

Expand All @@ -484,10 +483,10 @@ _CFXMLNodePtr _CFXMLNodeProperties(_CFXMLNodePtr node) {
}

CFIndex _CFXMLNodeGetType(_CFXMLNodePtr node) {
if (!node) {
return _kCFXMLTypeInvalid;
if (node) {
return ((xmlNodePtr)node)->type;
}
return ((xmlNodePtr)node)->type;
return _kCFXMLTypeInvalid;
}

static inline xmlChar* _getQName(xmlNodePtr node) {
Expand Down
1 change: 1 addition & 0 deletions Foundation/XMLNode.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ open class XMLNode: NSObject, NSCopying {
break
case .namespace:
_CFXMLNamespaceSetPrefix(_xmlNode, newValue, Int64(newValue?.utf8.count ?? 0))

default:
if let newName = newValue {
_CFXMLNodeSetName(_xmlNode, newName)
Expand Down
4 changes: 2 additions & 2 deletions TestFoundation/TestXMLDocument.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ class TestXMLDocument : LoopbackServerTest {
do {
try doc.validate()
} catch {
XCTFail("\(error)")
XChttps://github.com/apple/swift-corelibs-foundation/pull/2453/conflict?name=TestFoundation%252FTestXMLDocument.swift&ancestor_oid=f51bd9de96b2ba008d560586ce1742854437931e&base_oid=c5ecbf64cdde4b340781f98aa322748e688b51d9&head_oid=ad8ea17cff29707342411d1e6598480d95b7d579TFail("\(error)")
}

let root = dtd?.elementDeclaration(forName:"root")
Expand Down Expand Up @@ -641,7 +641,7 @@ class TestXMLDocument : LoopbackServerTest {
XCTAssertEqual(XMLDTDNode(xmlString: "<!ELEMENT E EMPTY>")?.kind, .elementDeclaration)
XCTAssertEqual(XMLDTDNode(xmlString: #"<!NOTATION f SYSTEM "F">"#)?.kind, .notationDeclaration)
}

func test_sr10776_documentName() {
let doc = XMLDocument(rootElement: nil)
XCTAssertNil(doc.name)
Expand Down