Skip to content

Fix latest rchk issues #7585

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 10 commits into from
Jan 11, 2026
+11 −8
Merged

Fix latest rchk issues #7585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dab146a
attempt PROTECT for new rchk issues
MichaelChirico Jan 11, 2026
700d3a0
different approach for longestLevels
MichaelChirico Jan 11, 2026
e11ee93
use nprotect?
MichaelChirico Jan 11, 2026
01a3720
no longer using names SEXP
MichaelChirico Jan 11, 2026
05d3815
only UNPROTECT near exit
MichaelChirico Jan 11, 2026
acf0eb1
no, that cant be it...
MichaelChirico Jan 11, 2026
f76a4ce
move assignment into loop
MichaelChirico Jan 11, 2026
3897ad0
REPROTECT approach
MichaelChirico Jan 11, 2026
bda946b
reduce diff
MichaelChirico Jan 11, 2026
09d384c
reduce diff
MichaelChirico Jan 11, 2026
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/assign.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ void setselfref(SEXP x) {
*/

static int _selfrefok(SEXP x, Rboolean checkNames, Rboolean verbose) {
SEXP v, p, tag, prot, names;
SEXP v, p, tag, prot;
v = getAttrib(x, SelfRefSymbol);
if (v==R_NilValue || TYPEOF(v)!=EXTPTRSXP) {
// .internal.selfref missing is expected and normal for i) a pre v1.7.8 data.table loaded
Expand All @@ -70,11 +70,11 @@ static int _selfrefok(SEXP x, Rboolean checkNames, Rboolean verbose) {
if (!isNull(p)) internal_error(__func__, ".internal.selfref ptr is neither NULL nor R_NilValue"); // # nocov
tag = R_ExternalPtrTag(v);
if (!(isNull(tag) || isString(tag))) internal_error(__func__, ".internal.selfref tag is neither NULL nor a character vector"); // # nocov
names = getAttrib(x, R_NamesSymbol);
prot = R_ExternalPtrProtected(v);
if (TYPEOF(prot) != EXTPTRSXP) // Very rare. Was error(_(".internal.selfref prot is not itself an extptr")).
return 0; // # nocov ; see http://stackoverflow.com/questions/15342227/getting-a-random-internal-selfref-error-in-data-table-for-r
return checkNames ? names==tag : x==R_ExternalPtrAddr(prot);
if (!checkNames) return x == R_ExternalPtrAddr(prot);
return getAttrib(x, R_NamesSymbol) == tag;
}

static Rboolean selfrefok(SEXP x, Rboolean verbose) { // for readability
Expand Down
7 changes: 4 additions & 3 deletions src/mergelist.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,10 @@ SEXP cbindlist(SEXP x, SEXP copyArg) {
SET_VECTOR_ELT(ans, ians, thisxcol);
SET_STRING_ELT(names, ians, STRING_ELT(thisnames, j));
}
mergeIndexAttrib(index, getAttrib(thisx, sym_index));
if (isNull(key)) // first key is retained
key = getAttrib(thisx, sym_sorted);
mergeIndexAttrib(index, PROTECT(getAttrib(thisx, sym_index))); protecti++;
if (isNull(key)) { // first key is retained
key = PROTECT(getAttrib(thisx, sym_sorted)); protecti++;
}
UNPROTECT(protecti); // thisnames, thisxcol
}
if (!ANY_ATTRIB(index))
Expand Down
6 changes: 4 additions & 2 deletions src/rbindlist.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,9 @@ SEXP rbindlist(SEXP l, SEXP usenamesArg, SEXP fillArg, SEXP idcolArg, SEXP ignor
int maxType=LGLSXP; // initialize with LGLSXP for test 2002.3 which has col x NULL in both lists to be filled with NA for #1871
bool factor=false, orderedFactor=false; // ordered factor is class c("ordered","factor"). isFactor() is true when isOrdered() is true.
int longestLen=-1, longestW=-1, longestI=-1; // just for ordered factor; longestLen must be initialized as -1 so that rbind zero-length ordered factor could work #4795
PROTECT_INDEX ILongestLevels;
SEXP longestLevels=R_NilValue; // just for ordered factor
PROTECT_WITH_INDEX(longestLevels, &ILongestLevels); nprotect++;
bool int64=false, date=false, posixct=false, itime=false, asis=false;
const char *foundName=NULL;
bool anyNotStringOrFactor=false;
Expand All @@ -303,7 +305,7 @@ SEXP rbindlist(SEXP l, SEXP usenamesArg, SEXP fillArg, SEXP idcolArg, SEXP ignor
if (isOrdered(thisCol)) {
orderedFactor = true;
int thisLen = length(getAttrib(thisCol, R_LevelsSymbol));
if (thisLen>longestLen) { longestLen=thisLen; longestLevels=getAttrib(thisCol, R_LevelsSymbol); /*for warnings later ...*/longestW=w; longestI=i; }
if (thisLen > longestLen) { longestLen=thisLen; REPROTECT(longestLevels=getAttrib(thisCol, R_LevelsSymbol), ILongestLevels); /*for warnings later ...*/longestW=w; longestI=i; }
}
} else if (!isString(thisCol)) anyNotStringOrFactor=true; // even for length 0 columns for consistency; test 2113.3
if (INHERITS(thisCol, char_integer64)) {
Expand Down Expand Up @@ -562,6 +564,6 @@ SEXP rbindlist(SEXP l, SEXP usenamesArg, SEXP fillArg, SEXP idcolArg, SEXP ignor
}
}
}
UNPROTECT(nprotect); // ans, ansNames, coercedForFactor?
UNPROTECT(nprotect); // ans, ansNames, longestLevels? coercedForFactor?
return(ans);
}
Loading