Skip to content

rchk subsetDT issues #7520

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
ben-schwen merged 2 commits into from
Dec 26, 2025
+3 −3
Merged

rchk subsetDT issues #7520

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
738490a
make rchk happy
ben-schwen Dec 26, 2025
18b3147
Merge branch 'master' into subset_rchk
MichaelChirico Dec 26, 2025
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
6 changes: 3 additions & 3 deletions src/subset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ SEXP subsetDT(SEXP x, SEXP rows, SEXP cols) { // API change needs update NEWS.md
SEXP tmp = PROTECT(R_allocResizableVector(STRSXP, LENGTH(cols)+overAlloc)); nprotect++;
R_resizeVector(tmp, LENGTH(cols));
setAttrib(ans, R_NamesSymbol, tmp);
subsetVectorRaw(tmp, getAttrib(x, R_NamesSymbol), cols, /*anyNA=*/false);
subsetVectorRaw(tmp, PROTECT(getAttrib(x, R_NamesSymbol)), cols, /*anyNA=*/false); nprotect++;

tmp = PROTECT(allocVector(INTSXP, 2)); nprotect++;
INTEGER(tmp)[0] = NA_INTEGER;
Expand All @@ -341,7 +341,7 @@ SEXP subsetDT(SEXP x, SEXP rows, SEXP cols) { // API change needs update NEWS.md
// clear any index that was copied over by copyMostAttrib() above, e.g. #1760 and #1734 (test 1678)
setAttrib(ans, sym_index, R_NilValue);
// but maintain key if ordered subset
SEXP key = getAttrib(x, sym_sorted);
SEXP key = PROTECT(getAttrib(x, sym_sorted)); nprotect++;
if (length(key)) {
SEXP innames = PROTECT(getAttrib(ans,R_NamesSymbol)); nprotect++;
SEXP in = PROTECT(chin(key, innames)); nprotect++;
Expand All @@ -352,7 +352,7 @@ SEXP subsetDT(SEXP x, SEXP rows, SEXP cols) { // API change needs update NEWS.md
setAttrib(ans, sym_sorted, R_NilValue);
} else {
// make a new key attribute; shorter if i<LENGTH(key) or same length copied so this key is safe to change by ref (setnames)
setAttrib(ans, sym_sorted, tmp=allocVector(STRSXP, i));
setAttrib(ans, sym_sorted, tmp=PROTECT(allocVector(STRSXP, i))); nprotect++;
for (int j=0; j<i; j++) SET_STRING_ELT(tmp, j, STRING_ELT(key, j));
}
}
Expand Down
Loading