Skip to content

don't trust all.vars when its arguments contains get/eval #4982

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
mattdowle merged 4 commits into from
May 9, 2021
Merged

don't trust all.vars when its arguments contains get/eval #4982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f2d037f
Fix #4981: don't trust all.vars when its arguments contains get/eval …
OfekShilon May 8, 2021
df74b8a
Add unit tests for #4981
OfekShilon May 9, 2021
226cfe5
Merge branch 'master' into 4981
OfekShilon May 9, 2021
93247ec
Merge branch 'master' into 4981
OfekShilon May 9, 2021
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
9 changes: 8 additions & 1 deletion R/data.table.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,14 @@ replace_dot_alias = function(e) {
bysub = parse(text=paste0("list(",paste(bysub,collapse=","),")"))[[1L]]
bysubl = as.list.default(bysub)
}
allbyvars = intersect(all.vars(bysub), names_x)
# Fix 4981: when the 'by' expression includes get/mget/eval, all.vars
# cannot be trusted to infer all used columns
bysub.elems <- rapply(as.list(bysub), as.character)
Copy link
Copy Markdown
Member

@mattdowle mattdowle May 9, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is failing R 3.1.0 with :

> af[, mean(a), by = "itime"]
Error in .Primitive("as.character")(list, ...) : 
  cannot coerce type 'builtin' to vector of type 'character'
Calls: [ -> [.data.table -> rapply
Execution halted

will fix ...

if (any(c("eval","evalq","eval.parent","local","get","mget","dynGet") %chin% bysub.elems))
allbyvars = NULL
else
allbyvars = intersect(all.vars(bysub), names_x)

orderedirows = .Call(CisOrderedSubset, irows, nrow(x)) # TRUE when irows is NULL (i.e. no i clause). Similar but better than is.sorted(f__)
bysameorder = byindex = FALSE
if (!bysub %iscall% ":" && ##Fix #4285
Expand Down
11 changes: 11 additions & 0 deletions inst/tests/tests.Rraw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17515,3 +17515,14 @@ test(2183.79, melt(DTid, measure.vars=measure(letter, number, pattern=as.integer
test(2183.80, melt(DTid, measure.vars=measure(letter, number, sep=as.integer)), error="sep must be character string")
##melt(DTid, measure.vars=measure(letter, number, sep=NA_character_)
##melt(DTid, measure.vars=measure(letter, number, sep=character())

# `keyby` allows mixing eval/get with direct columns, #4981
dt <- data.table(a=c(1,2), b=c(3,4), c=c(1,0))
dt2 <- dt[,.(suma=sum(a)), keyby=.(b=get("b"),c)]
test(2184.1, dt2[1, suma], 1)
dt2 <- dt[2,.(suma=sum(a)), keyby=.(b=b,c)]
test(2184.2, dt2[1, suma], 2)
dt2 <- dt[2,.(suma=sum(a)), keyby=.(b=get("b"))]
test(2184.3, dt2[1, suma], 2)
dt2 <- dt[2,.(suma=sum(a)), keyby=.(b=get("b"),c)]
test(2184.4, dt2[1, suma], 2)