Skip to content

add a type check to xpath_search #324

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

Merged
merged 2 commits into from
Nov 30, 2020
Merged

add a type check to xpath_search #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b222c1a
add a type check to xpath_search
MichaelChirico Nov 25, 2020
e34fa2f
add NEWS
MichaelChirico Nov 30, 2020
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
2 changes: 2 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

* `write_xml()` and `write_html()` now return NULL invisibly, as they did prior to version 1.3.0 (#307)

* `xml_find_all.xml_node()` fails more informatively the `xpath` parameter is the wrong type (@michaelchirico)

# xml2 1.3.2

* `read_html()` and `read_xml()` now error if passed strings of length greater than one (#121)
Expand Down
3 changes: 3 additions & 0 deletions src/xml2_xpath.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ extern "C" SEXP xpath_search(SEXP node_sxp, SEXP doc_sxp, SEXP xpath_sxp, SEXP n

XPtrNode node(node_sxp);
XPtrDoc doc(doc_sxp);
if (TYPEOF(xpath_sxp) != STRSXP) {
Rf_error("XPath must be a string, received %s", type2char(TYPEOF(xpath_sxp)));
}
const char* xpath = CHAR(STRING_ELT(xpath_sxp, 0));

double num_results = REAL(num_results_sxp)[0];
Expand Down
7 changes: 7 additions & 0 deletions tests/testthat/test-xml_find.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,3 +150,10 @@ test_that("Searches with entities work (#241)", {

expect_equal(xml_text(field1), "foo bar Quantitative Consultancy")
})

test_that("A helpful error is given from non-string xpath in xml_find_first/all", {
node <- read_xml("<a>1</a>")

expect_error(xml_find_all(node, 1), "XPath must be a string", fixed = TRUE)
expect_error(xml_find_first(node, 1), "XPath must be a string", fixed = TRUE)
})