Skip to content

fix: add missing PROTECT #1382

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
krlmlr merged 3 commits into from
May 31, 2024
Merged

fix: add missing PROTECT #1382

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf92b83
fix protects
Antonov548 May 21, 2024
b5e46cb
Merge branch 'main' into fix/protect
Antonov548 May 30, 2024
c97f506
Merge branch 'main' into fix/protect
Antonov548 May 31, 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
17 changes: 12 additions & 5 deletions src/rinterface_extra.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ igraph_error_t R_igraph_attribute_init(igraph_t *graph, igraph_vector_ptr_t *att
SEXP result, names, gal;
int px = 0;

result=NEW_LIST(4);
result=PROTECT(NEW_LIST(4));
// The "preserve list" Will be cleared with the next invocation of IGRAPH_R_CHECK().
// Adding to that list ensures that the attributes aren't GC-ed prematurely.
R_igraph_attribute_add_to_preserve_list(result);
Expand All @@ -338,6 +338,7 @@ igraph_error_t R_igraph_attribute_init(igraph_t *graph, igraph_vector_ptr_t *att
SET_VECTOR_ELT(result, i, attr); /* gal, val, eal */
UNPROTECT(1);
}
UNPROTECT(1);
graph->attr=result;

/* Add graph attributes */
Expand Down Expand Up @@ -525,8 +526,10 @@ void R_igraph_attribute_add_vertices_append(SEXP val, igraph_integer_t nv,
}

SEXP R_igraph_attribute_add_vertices_dup(SEXP attr) {
SEXP newattr=Rf_duplicate(attr);
SEXP newattr;
PROTECT(newattr=Rf_duplicate(attr));
R_igraph_attribute_add_to_preserve_list(newattr);
UNPROTECT(1);
return newattr;
}

Expand Down Expand Up @@ -667,8 +670,9 @@ igraph_error_t R_igraph_attribute_permute_vertices_same(const igraph_t *graph,
SEXP ss;
int px = 0;

SEXP newattr = Rf_duplicate(attr);
SEXP newattr = PROTECT(Rf_duplicate(attr));
R_igraph_attribute_add_to_preserve_list(newattr);
UNPROTECT(1);
attr=newgraph->attr=newattr;

val=VECTOR_ELT(attr,2);
Expand Down Expand Up @@ -754,8 +758,10 @@ igraph_error_t R_igraph_attribute_permute_vertices(const igraph_t *graph,
}

SEXP R_igraph_attribute_add_edges_dup(SEXP attr) {
SEXP newattr=Rf_duplicate(attr);
SEXP newattr;
PROTECT(newattr=Rf_duplicate(attr));
R_igraph_attribute_add_to_preserve_list(newattr);
UNPROTECT(1);
return newattr;
}

Expand Down Expand Up @@ -977,8 +983,9 @@ igraph_error_t R_igraph_attribute_permute_edges_same(const igraph_t *graph,
SEXP ss;
int px = 0;

SEXP newattr=Rf_duplicate(attr);
SEXP newattr=PROTECT(Rf_duplicate(attr));
R_igraph_attribute_add_to_preserve_list(newattr);
UNPROTECT(1);
attr=newgraph->attr=newattr;

eal=VECTOR_ELT(attr,3);
Expand Down