Skip to content

Commit b30437b

Browse files
really restore from master
1 parent e9387d2 commit b30437b

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/bmerge.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,11 @@ SEXP bmerge(SEXP idt, SEXP xdt, SEXP icolsArg, SEXP xcolsArg, SEXP xoArg, SEXP r
182182
allGrp1[0] = TRUE;
183183
protecti += 2;
184184

185-
SEXP oSxp = PROTECT(forderReuseSorting(idt, icolsArg, /* retGrpArg= */ScalarLogical(FALSE), /* retStatsArg= */ScalarLogical(FALSE), /* sortGroupsArg= */ScalarLogical(TRUE), /* ascArg= */ScalarInteger(1), /* naArg= */ScalarLogical(FALSE), /* lazyArg= */ScalarLogical(TRUE))); protecti++;
185+
SEXP ascArg = PROTECT(ScalarInteger(1));
186+
SEXP oSxp = PROTECT(forderReuseSorting(idt, icolsArg, /* retGrpArg= */ScalarLogical(FALSE), /* retStatsArg= */ScalarLogical(FALSE), /* sortGroupsArg= */ScalarLogical(TRUE), ascArg, /* naArg= */ScalarLogical(FALSE), /* reuseSortingArg= */ScalarLogical(TRUE))); protecti++;
187+
UNPROTECT(2); // down stack to 'ascArg'
188+
PROTECT(oSxp);
189+
186190
if (!LENGTH(oSxp))
187191
o = NULL;
188192
else

0 commit comments

Comments
 (0)