Skip to content
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

Jump to bottom

Issues with memory management in fmelt #6248

Merged
merged 5 commits into from
Jul 13, 2024
Merged

Issues with memory management in fmelt #6248

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b62fa6
Update fmelt.c
MichaelChirico Jul 12, 2024
e188508
UNPROTECT() _after_ using unique_col_numbers
MichaelChirico Jul 12, 2024
9074022
missing ';'
MichaelChirico Jul 12, 2024
4c28a7a
NEWS
MichaelChirico Jul 13, 2024
ea67015
Merge branch 'master' into fmelt-protect
MichaelChirico Jul 13, 2024
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
5 changes: 3 additions & 2 deletions src/fmelt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,9 @@ SEXP uniq_diff(SEXP int_or_list, int ncol, bool is_measure) {
INTEGER(unique_col_numbers)[unique_i++] = INTEGER(int_vec)[i];
}
}
SEXP out = set_diff(unique_col_numbers, ncol);
UNPROTECT(3);
return set_diff(unique_col_numbers, ncol);
return out;
}

SEXP cols_to_int_or_list(SEXP cols, SEXP dtnames, bool is_measure) {
Expand Down Expand Up @@ -247,7 +248,7 @@ SEXP checkVars(SEXP DT, SEXP id, SEXP measure, Rboolean verbose) {
if (length(value_col)) Rprintf(_("Assigned 'measure.vars' are [%s].\n"), concat(dtnames, value_col));
}
} else if (isNull(id) && !isNull(measure)) {
SEXP measure_int_or_list = cols_to_int_or_list(measure, dtnames, true);
SEXP measure_int_or_list = PROTECT(cols_to_int_or_list(measure, dtnames, true)); protecti++;
idcols = PROTECT(uniq_diff(measure_int_or_list, ncol, true)); protecti++;
if (isNewList(measure)) valuecols = measure_int_or_list;
else {
Expand Down
Loading