Skip to content

Commit fe3a56b

Browse files
committed
possible fix for rchk warning
1 parent 4f4fc35 commit fe3a56b

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/c_dfRowsToList.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,14 @@ SEXP c_dfRowsToList(SEXP s_df, SEXP s_pars, SEXP s_types, SEXP s_parnames, SEXP
7070

7171
/* convert discrete names to values */
7272
if (!all_missing && type == 3) {
73-
SEXP ns = PROTECT(eval(lang2(install("getNamespace"), ScalarString(mkChar("ParamHelpers"))), R_GlobalEnv));
73+
SEXP pkg = PROTECT(ScalarString(mkChar("ParamHelpers")));
74+
SEXP get_namespace = PROTECT(install("getNamespace"));
75+
SEXP ns = PROTECT(eval(lang2(get_namespace, pkg), R_GlobalEnv));
7476
SEXP s_call = PROTECT(lang3(install("discreteNameToValue"), R_NilValue, R_NilValue));
7577
SETCADR(s_call, VECTOR_ELT(s_pars, par));
7678
SETCADDR(s_call, s_parval);
7779
s_parval = PROTECT(eval(s_call, ns));
78-
UNPROTECT(3); /* ns, s_call, ? */
80+
UNPROTECT(5); /* ns, s_call, ? */
7981
}
8082

8183
/* only support for cnames for num, int, log and char vecs currently */

0 commit comments

Comments
 (0)