Skip to content

fix: The internal R_igraph_restore_pointer() no longer leaks memory #813

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 4 commits into from
Jun 5, 2023
Merged

fix: The internal R_igraph_restore_pointer() no longer leaks memory #813

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
236ca39
fix missed destroy of vector
Antonov548 May 23, 2023
d5efbaa
memory safety `restore_pointer`
Antonov548 May 24, 2023
56341a6
Merge branch 'main' into f-memory-leak
krlmlr May 27, 2023
005d1d0
Merge branch 'main' into f-memory-leak
krlmlr May 28, 2023
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
34 changes: 22 additions & 12 deletions src/rinterface_extra.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2940,11 +2940,9 @@ void R_igraph_set_pointer(SEXP result, const igraph_t* graph) {
UNPROTECT(px);
}

void R_igraph_restore_pointer(SEXP graph) {
igraph_t g;
igraph_vector_t v;
igraph_integer_t n=REAL(VECTOR_ELT(graph, igraph_t_idx_n))[0];
igraph_bool_t directed=LOGICAL(VECTOR_ELT(graph, igraph_t_idx_directed))[0];
static int restore_pointer(SEXP graph, igraph_t *g) {
igraph_integer_t no_of_nodes = REAL(VECTOR_ELT(graph, igraph_t_idx_n))[0];
igraph_bool_t directed = LOGICAL(VECTOR_ELT(graph, igraph_t_idx_directed))[0];

R_igraph_status_handler("Restore graph external pointer.\n", NULL);

Expand All @@ -2954,16 +2952,28 @@ void R_igraph_restore_pointer(SEXP graph) {
igraph_vector_t to;
R_SEXP_to_vector(VECTOR_ELT(graph, igraph_t_idx_to), &to);

igraph_integer_t i, s=igraph_vector_size(&from);
igraph_vector_init(&v, s*2);
igraph_vector_t edges;
igraph_integer_t no_of_edges=igraph_vector_size(&from);
IGRAPH_VECTOR_INIT_FINALLY(&edges, no_of_edges*2);

for (i = 0; i < s; ++i) {
igraph_vector_set(&v, i*2, VECTOR(from)[i]);
igraph_vector_set(&v, i*2+1, VECTOR(to)[i]);
for (igraph_integer_t i = 0; i < no_of_edges; ++i) {
VECTOR(edges)[2*i] = VECTOR(from)[i];
VECTOR(edges)[2*i+1] = VECTOR(to)[i];
}

igraph_empty(&g, n, directed);
igraph_add_edges(&g, &v, NULL);
IGRAPH_CHECK(igraph_empty(g, no_of_nodes, directed));
IGRAPH_FINALLY(igraph_destroy, g);
IGRAPH_CHECK(igraph_add_edges(g, &edges, NULL));

igraph_vector_destroy(&edges);
IGRAPH_FINALLY_CLEAN(2); /* +1 for g */

return IGRAPH_SUCCESS;
}

void R_igraph_restore_pointer(SEXP graph) {
igraph_t g;
IGRAPH_R_CHECK(restore_pointer(graph, &g));
R_igraph_set_pointer(graph, &g);
}

Expand Down