From 239e03bc75f3276e4e4e3881489b34eb9660afb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <kirill@cynkra.com>
Date: Wed, 11 Dec 2024 10:50:53 +0100
Subject: [PATCH 1/5] feat: Use `_pv` destroy functions to satisfy UBSAN checks

---
 src/rinterface.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/rinterface.c b/src/rinterface.c
index dc9615cf15..0b66ede1f9 100644
--- a/src/rinterface.c
+++ b/src/rinterface.c
@@ -24,6 +24,20 @@
 
 #include "rinterface.h"
 
+// This is a variant of IGRAPH_FINALLY that satisfies UBSAN checks.
+#define IGRAPH_FINALLY_PV(func, ptr) \
+    do { \
+        /* the following branch makes the compiler check the compatibility of \
+         * func and ptr to detect cases when we are accidentally invoking an \
+         * incorrect destructor function with the pointer */ \
+        if (0) { func(ptr); } \
+        IGRAPH_FINALLY_REAL((func##_pv), (ptr)); \
+    } while (0)
+
+void igraph_vector_int_destroy_pv(void* pv_ptr) {
+  igraph_vector_int_destroy((igraph_vector_int_t*) pv_ptr);
+}
+
 /***********************************************/
 /* THE REST IS GENERATED BY stimulus           */
 /***********************************************/
@@ -11272,7 +11286,7 @@ SEXP R_igraph_eulerian_cycle(SEXP graph) {
   if (0 != igraph_vector_int_init(&c_vertex_res, 0)) {
     igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
   }
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &c_vertex_res);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &c_vertex_res);
                                         /* Call igraph */
   IGRAPH_R_CHECK(igraph_eulerian_cycle(&c_graph, &c_edge_res, &c_vertex_res));
 

From 27ca6ab380715802870e1316815cc3a8c02af81e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <kirill@cynkra.com>
Date: Wed, 11 Dec 2024 11:00:38 +0100
Subject: [PATCH 2/5] Satisfy Stimulus

---
 src/vendor/cigraph/interfaces/functions.yaml |  2 +-
 src/vendor/cigraph/interfaces/types.yaml     |  7 +++++++
 tools/stimulus/types-RC.yaml                 | 21 ++++++++++++++++++++
 tools/stimulus/types-RR.yaml                 | 13 ++++++++++++
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/vendor/cigraph/interfaces/functions.yaml b/src/vendor/cigraph/interfaces/functions.yaml
index 7f7f02ee21..34f3b99384 100644
--- a/src/vendor/cigraph/interfaces/functions.yaml
+++ b/src/vendor/cigraph/interfaces/functions.yaml
@@ -2524,7 +2524,7 @@ igraph_eulerian_path:
     DEPS: edge_res ON graph, vertex_res ON graph
 
 igraph_eulerian_cycle:
-    PARAMS: GRAPH graph, OPTIONAL OUT EDGE_INDICES edge_res, OPTIONAL OUT VERTEX_INDICES vertex_res
+    PARAMS: GRAPH graph, OPTIONAL OUT EDGE_INDICES edge_res, OPTIONAL OUT VERTEX_INDICES_PV vertex_res
     DEPS: edge_res ON graph, vertex_res ON graph
 
 #######################################
diff --git a/src/vendor/cigraph/interfaces/types.yaml b/src/vendor/cigraph/interfaces/types.yaml
index 06d66dd4ee..27fd70c03b 100644
--- a/src/vendor/cigraph/interfaces/types.yaml
+++ b/src/vendor/cigraph/interfaces/types.yaml
@@ -157,6 +157,13 @@ VERTEX_INDICES:
     CTYPE: igraph_vector_int_t
     FLAGS: BY_REF
 
+# Temporary, for https://github.com/igraph/rigraph/pull/1630
+# We should call the `_PV` versions for all types in the future.
+VERTEX_INDICES_PV:
+    # An integer vector containing vertex indices.
+    CTYPE: igraph_vector_int_t
+    FLAGS: BY_REF
+
 VERTEX_INDEX_PAIRS:
     # An integer vector containing pairs of vertex indices, in a flattened
     # representation
diff --git a/tools/stimulus/types-RC.yaml b/tools/stimulus/types-RC.yaml
index 0b563a9648..8530ccbd4e 100644
--- a/tools/stimulus/types-RC.yaml
+++ b/tools/stimulus/types-RC.yaml
@@ -536,6 +536,27 @@ VERTEX_INDICES:
             igraph_vector_int_destroy(&%C%);
             IGRAPH_FINALLY_CLEAN(1);
 
+VERTEX_INDICES_PV:
+    CALL: '&%C%'
+    CTYPE: igraph_vector_int_t
+    INCONV:
+        IN: |-
+            R_SEXP_to_vector_int_copy(%I%, &%C%);
+            IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &%C%);
+        OUT: |-
+            if (0 != igraph_vector_int_init(&%C%, 0)) {
+              igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
+            }
+            IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &%C%);
+    OUTCONV:
+        IN: |-
+            igraph_vector_int_destroy(&%C%);
+            IGRAPH_FINALLY_CLEAN(1);
+        OUT: |-
+            PROTECT(%I%=R_igraph_vector_int_to_SEXPp1(&%C%));
+            igraph_vector_int_destroy(&%C%);
+            IGRAPH_FINALLY_CLEAN(1);
+
 VERTEX_INDEX_PAIRS:
     CALL: '&%C%'
     CTYPE: igraph_vector_int_t
diff --git a/tools/stimulus/types-RR.yaml b/tools/stimulus/types-RR.yaml
index c72ed787de..c1becd741b 100644
--- a/tools/stimulus/types-RR.yaml
+++ b/tools/stimulus/types-RR.yaml
@@ -141,6 +141,19 @@ VERTEX_INDICES:
               %I% <- create_vs(%I1%, %I%)
             }
 
+# Temporary, for https://github.com/igraph/rigraph/pull/1630
+# We should call the `_PV` versions for all types in the future.
+VERTEX_INDICES_PV:
+    CALL: '%I%-1'
+    DEFAULT:
+        ALL: V(%I1%)
+    INCONV: '%I% <- as_igraph_vs(%I1%, %I%)'
+    OUTCONV:
+        OUT: |-
+            if (igraph_opt("return.vs.es")) {
+              %I% <- create_vs(%I1%, %I%)
+            }
+
 EDGE_INDICES:
     CALL: '%I%-1'
     DEFAULT:

From 367f89e1ecf08d7006a07782066a5229dedffc1b Mon Sep 17 00:00:00 2001
From: Antonov548 <antonov5551998@gmail.com>
Date: Wed, 11 Dec 2024 13:27:13 +0100
Subject: [PATCH 3/5] move to proper place

---
 src/rinterface.c       | 14 --------------
 src/rinterface.h       | 12 ++++++++++++
 src/rinterface_extra.c |  5 +++++
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/rinterface.c b/src/rinterface.c
index 0b66ede1f9..4d1365f4a4 100644
--- a/src/rinterface.c
+++ b/src/rinterface.c
@@ -24,20 +24,6 @@
 
 #include "rinterface.h"
 
-// This is a variant of IGRAPH_FINALLY that satisfies UBSAN checks.
-#define IGRAPH_FINALLY_PV(func, ptr) \
-    do { \
-        /* the following branch makes the compiler check the compatibility of \
-         * func and ptr to detect cases when we are accidentally invoking an \
-         * incorrect destructor function with the pointer */ \
-        if (0) { func(ptr); } \
-        IGRAPH_FINALLY_REAL((func##_pv), (ptr)); \
-    } while (0)
-
-void igraph_vector_int_destroy_pv(void* pv_ptr) {
-  igraph_vector_int_destroy((igraph_vector_int_t*) pv_ptr);
-}
-
 /***********************************************/
 /* THE REST IS GENERATED BY stimulus           */
 /***********************************************/
diff --git a/src/rinterface.h b/src/rinterface.h
index 2ef7b02705..5df48f96f5 100644
--- a/src/rinterface.h
+++ b/src/rinterface.h
@@ -120,6 +120,18 @@ igraph_error_t R_SEXP_to_attr_comb(SEXP input, igraph_attribute_combination_t *c
         else if (__c != IGRAPH_SUCCESS) { R_igraph_error(); } \
     } while (0)
 
+// This is a variant of IGRAPH_FINALLY that satisfies UBSAN checks.
+#define IGRAPH_FINALLY_PV(func, ptr) \
+    do { \
+        /* the following branch makes the compiler check the compatibility of \
+         * func and ptr to detect cases when we are accidentally invoking an \
+         * incorrect destructor function with the pointer */ \
+        if (0) { func(ptr); } \
+        IGRAPH_FINALLY_REAL((func##_pv), (ptr)); \
+    } while (0)
+
+void igraph_vector_int_destroy_pv(void* pv_ptr);
+
 #define IGRAPH_R_CHECK_INT(v) R_check_int_scalar(v)
 #define IGRAPH_R_CHECK_REAL(v) R_check_real_scalar(v)
 #define IGRAPH_R_CHECK_BOOL(v) R_check_bool_scalar(v)
diff --git a/src/rinterface_extra.c b/src/rinterface_extra.c
index 08ddbda3c4..250edd44c2 100644
--- a/src/rinterface_extra.c
+++ b/src/rinterface_extra.c
@@ -99,6 +99,11 @@ void R_check_bool_scalar(SEXP value)
   }
 }
 
+void igraph_vector_int_destroy_pv(void* pv_ptr)
+{
+  igraph_vector_int_destroy((igraph_vector_int_t*) pv_ptr);
+}
+
 SEXP R_igraph_i_lang7(SEXP s, SEXP t, SEXP u, SEXP v, SEXP w, SEXP x, SEXP y)
 {
     PROTECT(s);

From f5b816a346fa66f6cf89e1027e316ba3b68c3fe4 Mon Sep 17 00:00:00 2001
From: Antonov548 <antonov5551998@gmail.com>
Date: Thu, 2 Jan 2025 21:32:21 +0100
Subject: [PATCH 4/5] use _pv function for vector_int/igraph/vector/matrix/bool

---
 src/rinterface.h       |   7 +-
 src/rinterface_extra.c | 481 ++++++++++++++++++++++-------------------
 2 files changed, 259 insertions(+), 229 deletions(-)

diff --git a/src/rinterface.h b/src/rinterface.h
index b01fa51b0a..04e0192e37 100644
--- a/src/rinterface.h
+++ b/src/rinterface.h
@@ -130,7 +130,12 @@ igraph_error_t R_SEXP_to_attr_comb(SEXP input, igraph_attribute_combination_t *c
         IGRAPH_FINALLY_REAL((func##_pv), (ptr)); \
     } while (0)
 
-void igraph_vector_int_destroy_pv(void* pv_ptr);
+void igraph_destroy_pv(void *pv_ptr);
+void igraph_matrix_destroy_pv(void *pv_ptr);
+void igraph_vector_destroy_pv(void *pv_ptr);
+void igraph_vector_int_destroy_pv(void *pv_ptr);
+void igraph_vector_bool_destroy_pv(void *pv_ptr);
+void igraph_vector_int_list_destroy_pv(void *pv_ptr);
 
 #define IGRAPH_R_CHECK_INT(v) R_check_int_scalar(v)
 #define IGRAPH_R_CHECK_REAL(v) R_check_real_scalar(v)
diff --git a/src/rinterface_extra.c b/src/rinterface_extra.c
index 12cdd93e39..2014abe438 100644
--- a/src/rinterface_extra.c
+++ b/src/rinterface_extra.c
@@ -99,11 +99,36 @@ void R_check_bool_scalar(SEXP value)
   }
 }
 
+void igraph_destroy_pv(void* pv_ptr)
+{
+  igraph_destroy((igraph_t*) pv_ptr);
+}
+
+void igraph_matrix_destroy_pv(void *pv_ptr)
+{
+  igraph_matrix_destroy((igraph_matrix_t*) pv_ptr);
+}
+
+void igraph_vector_destroy_pv(void *pv_ptr)
+{
+  igraph_vector_destroy((igraph_vector_t*) pv_ptr);
+}
+
 void igraph_vector_int_destroy_pv(void* pv_ptr)
 {
   igraph_vector_int_destroy((igraph_vector_int_t*) pv_ptr);
 }
 
+void igraph_vector_bool_destroy_pv(void *pv_ptr)
+{
+  igraph_vector_bool_destroy((igraph_vector_bool_t*) pv_ptr);
+}
+
+void igraph_vector_int_list_destroy_pv(void *pv_ptr)
+{
+  igraph_vector_int_list_destroy((igraph_vector_int_list_t*) pv_ptr);
+}
+
 igraph_error_t R_get_int_scalar(SEXP sexp, R_xlen_t index, igraph_integer_t *res)
 {
   if (Rf_xlength(sexp) <= index)
@@ -591,7 +616,7 @@ igraph_error_t R_igraph_attribute_add_vertices(igraph_t *graph, igraph_integer_t
   /* First add the new attributes, if any */
   newattrs=0;
   if (igraph_vector_int_init(&news, 0)) Rf_error("Out of memory");
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &news);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &news);
   for (igraph_integer_t i=0; i<nattrno; i++) {
     igraph_attribute_record_t *nattr_entry=VECTOR(*nattr)[i];
     const char *nname=nattr_entry->name;
@@ -625,7 +650,7 @@ igraph_error_t R_igraph_attribute_add_vertices(igraph_t *graph, igraph_integer_t
     val=VECTOR_ELT(attr, 2);
     UNPROTECT(9);
   }
-  igraph_vector_int_destroy(&news);
+  igraph_vector_int_destroy_pv(&news);
   IGRAPH_FINALLY_CLEAN(1);      /* news */
 
   /* Now append the new values */
@@ -911,7 +936,7 @@ igraph_error_t R_igraph_attribute_add_edges(igraph_t *graph, const igraph_vector
   int px = 0;
 
   if (igraph_vector_int_init(&news, 0)) Rf_error("Out of memory");
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &news);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &news);
 
   SEXP newattr = PROTECT(R_igraph_attribute_add_edges_dup(attr)); px++;
   attr=graph->attr=newattr;
@@ -962,7 +987,7 @@ igraph_error_t R_igraph_attribute_add_edges(igraph_t *graph, const igraph_vector
     eal=VECTOR_ELT(attr, 3);
     UNPROTECT(9);
   }
-  igraph_vector_int_destroy(&news);
+  igraph_vector_int_destroy_pv(&news);
   IGRAPH_FINALLY_CLEAN(1);
 
   /* Now append the new values */
@@ -1287,7 +1312,7 @@ igraph_error_t R_igraph_attribute_get_numeric_vertex_attr(const igraph_t *graph,
 
   if (igraph_vs_is_all(&vs)) {
     R_SEXP_to_vector_copy(AS_NUMERIC(va), &newvalue);
-    igraph_vector_destroy(value);
+    igraph_vector_destroy_pv(value);
     *value=newvalue;
   } else {
     igraph_vit_t it;
@@ -1335,7 +1360,7 @@ igraph_error_t R_igraph_attribute_get_bool_vertex_attr(const igraph_t *graph,
 
   if (igraph_vs_is_all(&vs)) {
     R_SEXP_to_vector_bool_copy(va, &newvalue);
-    igraph_vector_bool_destroy(value);
+    igraph_vector_bool_destroy_pv(value);
     *value=newvalue;
   } else {
     igraph_vit_t it;
@@ -1412,7 +1437,7 @@ igraph_error_t R_igraph_attribute_get_numeric_edge_attr(const igraph_t *graph,
 
   if (igraph_es_is_all(&es)) {
     R_SEXP_to_vector_copy(AS_NUMERIC(ea), &newvalue);
-    igraph_vector_destroy(value);
+    igraph_vector_destroy_pv(value);
     *value=newvalue;
   } else {
     igraph_eit_t it;
@@ -1460,7 +1485,7 @@ igraph_error_t R_igraph_attribute_get_bool_edge_attr(const igraph_t *graph,
 
   if (igraph_es_is_all(&es)) {
     R_SEXP_to_vector_bool_copy(ea, &newvalue);
-    igraph_vector_bool_destroy(value);
+    igraph_vector_bool_destroy_pv(value);
     *value=newvalue;
   } else {
     igraph_eit_t it;
@@ -2550,7 +2575,7 @@ SEXP R_igraph_0orvector_int_to_SEXP_d(igraph_vector_int_t *v) {
   SEXP result;
   if (v) {
     PROTECT(result=R_igraph_vector_int_to_SEXP(v));
-    igraph_vector_int_destroy(v);
+    igraph_vector_int_destroy_pv(v);
   } else {
     PROTECT(result=R_NilValue);
   }
@@ -2797,11 +2822,11 @@ static igraph_error_t restore_pointer(SEXP graph, igraph_t *g) {
 
   igraph_vector_int_t from;
   R_SEXP_to_vector_int_copy(VECTOR_ELT(graph, igraph_t_idx_from), &from);
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &from);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &from);
 
   igraph_vector_int_t to;
   R_SEXP_to_vector_int_copy(VECTOR_ELT(graph, igraph_t_idx_to), &to);
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &to);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &to);
 
   igraph_vector_int_t edges;
   igraph_integer_t no_of_edges=igraph_vector_int_size(&from);
@@ -2813,12 +2838,12 @@ static igraph_error_t restore_pointer(SEXP graph, igraph_t *g) {
   }
 
   IGRAPH_CHECK(igraph_empty(g, no_of_nodes, directed));
-  IGRAPH_FINALLY(igraph_destroy, g);
+  IGRAPH_FINALLY_PV(igraph_destroy, g);
   IGRAPH_CHECK(igraph_add_edges(g, &edges, NULL));
 
-  igraph_vector_int_destroy(&from);
-  igraph_vector_int_destroy(&to);
-  igraph_vector_int_destroy(&edges);
+  igraph_vector_int_destroy_pv(&from);
+  igraph_vector_int_destroy_pv(&to);
+  igraph_vector_int_destroy_pv(&edges);
   IGRAPH_FINALLY_CLEAN(4); /* +1 for g */
 
   return IGRAPH_SUCCESS;
@@ -3044,19 +3069,19 @@ SEXP R_igraph_hrg_to_SEXP(const igraph_hrg_t *hrg) {
 
 igraph_error_t R_SEXP_to_hrg_copy(SEXP shrg, igraph_hrg_t *hrg) {
   IGRAPH_CHECK(R_SEXP_to_vector_int_copy(VECTOR_ELT(shrg, 0), &hrg->left));
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &hrg->left);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &hrg->left);
 
   IGRAPH_CHECK(R_SEXP_to_vector_int_copy(VECTOR_ELT(shrg, 1), &hrg->right));
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &hrg->right);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &hrg->right);
 
   IGRAPH_CHECK(R_SEXP_to_vector_copy(VECTOR_ELT(shrg, 2), &hrg->prob));
-  IGRAPH_FINALLY(igraph_vector_destroy, &hrg->prob);
+  IGRAPH_FINALLY_PV(igraph_vector_destroy, &hrg->prob);
 
   IGRAPH_CHECK(R_SEXP_to_vector_int_copy(VECTOR_ELT(shrg, 3), &hrg->edges));
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &hrg->edges);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &hrg->edges);
 
   IGRAPH_CHECK(R_SEXP_to_vector_int_copy(VECTOR_ELT(shrg, 4), &hrg->vertices));
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &hrg->vertices);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &hrg->vertices);
 
   IGRAPH_FINALLY_CLEAN(5);
 
@@ -3118,11 +3143,11 @@ SEXP R_igraph_arpack_unpack_complex(SEXP vectors, SEXP values, SEXP nev) {
   if (0 != R_SEXP_to_igraph_matrix_copy(vectors, &c_vectors)) {
     igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
   }
-  IGRAPH_FINALLY(igraph_matrix_destroy, &c_vectors);
+  IGRAPH_FINALLY_PV(igraph_matrix_destroy, &c_vectors);
   if (0 != R_SEXP_to_igraph_matrix_copy(values, &c_values)) {
     igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
   }
-  IGRAPH_FINALLY(igraph_matrix_destroy, &c_values);
+  IGRAPH_FINALLY_PV(igraph_matrix_destroy, &c_values);
   c_nev=REAL(nev)[0];
                                         /* Call igraph */
   IGRAPH_R_CHECK(igraph_arpack_unpack_complex(&c_vectors, &c_values, c_nev));
@@ -3131,10 +3156,10 @@ SEXP R_igraph_arpack_unpack_complex(SEXP vectors, SEXP values, SEXP nev) {
   PROTECT(r_result=NEW_LIST(2));
   PROTECT(r_names=NEW_CHARACTER(2));
   PROTECT(vectors=R_igraph_matrix_to_SEXP(&c_vectors));
-  igraph_matrix_destroy(&c_vectors);
+  igraph_matrix_destroy_pv(&c_vectors);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(values=R_igraph_matrix_to_SEXP(&c_values));
-  igraph_matrix_destroy(&c_values);
+  igraph_matrix_destroy_pv(&c_values);
   IGRAPH_FINALLY_CLEAN(1);
   SET_VECTOR_ELT(r_result, 0, vectors);
   SET_VECTOR_ELT(r_result, 1, values);
@@ -3179,10 +3204,10 @@ void R_igraph_sirlist_destroy(igraph_vector_ptr_t *sl) {
   igraph_integer_t n=igraph_vector_ptr_size(sl);
   for (igraph_integer_t i=0; i<n; i++) {
     igraph_sir_t *sir=VECTOR(*sl)[i];
-    igraph_vector_destroy(&sir->times);
-    igraph_vector_int_destroy(&sir->no_s);
-    igraph_vector_int_destroy(&sir->no_i);
-    igraph_vector_int_destroy(&sir->no_r);
+    igraph_vector_destroy_pv(&sir->times);
+    igraph_vector_int_destroy_pv(&sir->no_s);
+    igraph_vector_int_destroy_pv(&sir->no_i);
+    igraph_vector_int_destroy_pv(&sir->no_r);
     igraph_free(sir);
   }
   igraph_vector_ptr_destroy(sl);
@@ -3204,22 +3229,22 @@ SEXP R_igraph_sparsemat_to_SEXP_triplet(const igraph_sparsemat_t *sp) {
     igraph_vector_int_t i, j;
     igraph_vector_t x;
     igraph_vector_int_init(&i, nz);
-    IGRAPH_FINALLY(igraph_vector_int_destroy, &i);
+    IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &i);
 
     igraph_vector_int_init(&j, nz);
-    IGRAPH_FINALLY(igraph_vector_int_destroy, &j);
+    IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &j);
 
     igraph_vector_init(&x, nz);
-    IGRAPH_FINALLY(igraph_vector_destroy, &x);
+    IGRAPH_FINALLY_PV(igraph_vector_destroy, &x);
 
     igraph_sparsemat_getelements(sp, &j, &i, &x);
     SET_VECTOR_ELT(res, 2, R_igraph_vector_int_to_SEXP(&i));
     SET_VECTOR_ELT(res, 3, R_igraph_vector_int_to_SEXP(&j));
     SET_VECTOR_ELT(res, 4, R_igraph_vector_to_SEXP(&x));
 
-    igraph_vector_int_destroy(&i);
-    igraph_vector_int_destroy(&j);
-    igraph_vector_destroy(&x);
+    igraph_vector_int_destroy_pv(&i);
+    igraph_vector_int_destroy_pv(&j);
+    igraph_vector_destroy_pv(&x);
     IGRAPH_FINALLY_CLEAN(3);
   }
 
@@ -3841,12 +3866,12 @@ SEXP R_igraph_add_edges_manual(SEXP graph, SEXP edges) {
   SEXP result;
 
   R_SEXP_to_vector_int_copy(edges, &v);
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &v);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &v);
   R_SEXP_to_igraph_copy(graph, &g);
-  IGRAPH_FINALLY(igraph_destroy, &g);
+  IGRAPH_FINALLY_PV(igraph_destroy, &g);
   IGRAPH_R_CHECK(igraph_add_edges(&g, &v, 0));
   PROTECT(result=R_igraph_to_SEXP(&g));
-  igraph_vector_int_destroy(&v);
+  igraph_vector_int_destroy_pv(&v);
   IGRAPH_FINALLY_CLEAN(1);
   IGRAPH_I_DESTROY(&g);
   IGRAPH_FINALLY_CLEAN(1);
@@ -3900,7 +3925,7 @@ SEXP R_igraph_neighbors(SEXP graph, SEXP pvid, SEXP pmode) {
   IGRAPH_R_CHECK(igraph_neighbors(&g, &neis, (igraph_integer_t) vid, mode));
 
   PROTECT(result=R_igraph_vector_int_to_SEXP(&neis));
-  igraph_vector_int_destroy(&neis);
+  igraph_vector_int_destroy_pv(&neis);
 
   UNPROTECT(1);
   return result;
@@ -3921,7 +3946,7 @@ SEXP R_igraph_incident(SEXP graph, SEXP pvid, SEXP pmode) {
   IGRAPH_R_CHECK(igraph_incident(&g, &neis, (igraph_integer_t) vid, mode));
 
   PROTECT(result=R_igraph_vector_int_to_SEXP(&neis));
-  igraph_vector_int_destroy(&neis);
+  igraph_vector_int_destroy_pv(&neis);
 
   UNPROTECT(1);
   return result;
@@ -3939,7 +3964,7 @@ SEXP R_igraph_delete_edges(SEXP graph, SEXP edges) {
   IGRAPH_R_CHECK(igraph_delete_edges(&g, es));
   PROTECT(result=R_igraph_to_SEXP(&g));
   IGRAPH_I_DESTROY(&g);
-  igraph_vector_int_destroy(&es_data);
+  igraph_vector_int_destroy_pv(&es_data);
   igraph_es_destroy(&es);
 
   UNPROTECT(1);
@@ -3958,7 +3983,7 @@ SEXP R_igraph_delete_vertices(SEXP graph, SEXP vertices) {
   IGRAPH_R_CHECK(igraph_delete_vertices(&g, vs));
   PROTECT(result=R_igraph_to_SEXP(&g));
   IGRAPH_I_DESTROY(&g);
-  igraph_vector_int_destroy(&vs_data);
+  igraph_vector_int_destroy_pv(&vs_data);
   igraph_vs_destroy(&vs);
 
   UNPROTECT(1);
@@ -3996,7 +4021,7 @@ SEXP R_igraph_create(SEXP edges, SEXP pn, SEXP pdirected) {
   IGRAPH_R_CHECK(igraph_create(&g, &v, n, directed));
   PROTECT(result=R_igraph_to_SEXP(&g));
   IGRAPH_I_DESTROY(&g);
-  igraph_vector_int_destroy(&v);
+  igraph_vector_int_destroy_pv(&v);
 
   UNPROTECT(1);
   return result;
@@ -4018,8 +4043,8 @@ SEXP R_igraph_degree(SEXP graph, SEXP vids, SEXP pmode, SEXP ploops) {
   IGRAPH_R_CHECK(igraph_degree(&g, &res, vs, mode, loops));
 
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy(&res);
-  igraph_vector_int_destroy(&vs_data);
+  igraph_vector_int_destroy_pv(&res);
+  igraph_vector_int_destroy_pv(&vs_data);
   igraph_vs_destroy(&vs);
 
   UNPROTECT(1);
@@ -4068,7 +4093,7 @@ SEXP R_igraph_get_diameter(SEXP graph, SEXP pdirected, SEXP punconnected,
   IGRAPH_R_CHECK(igraph_diameter_dijkstra(&g, Rf_isNull(pweights) ? 0 : &weights, &dialen, 0, 0, &res, 0, directed, unconnected));
 
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy(&res);
+  igraph_vector_int_destroy_pv(&res);
 
   UNPROTECT(1);
   return result;
@@ -4117,7 +4142,7 @@ SEXP R_igraph_subcomponent(SEXP graph, SEXP pvertex, SEXP pmode) {
   IGRAPH_R_CHECK(igraph_subcomponent(&g, &res, vertex, mode));
 
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy(&res);
+  igraph_vector_int_destroy_pv(&res);
 
   UNPROTECT(1);
   return result;
@@ -4137,7 +4162,7 @@ SEXP R_igraph_running_mean(SEXP pdata, SEXP pbinwidth) {
 
   PROTECT(result=NEW_NUMERIC(igraph_vector_size(&res)));
   igraph_vector_copy_to(&res, REAL(result));
-  igraph_vector_destroy(&res);
+  igraph_vector_destroy_pv(&res);
 
   UNPROTECT(1);
   return result;
@@ -4157,8 +4182,8 @@ SEXP R_igraph_cocitation(SEXP graph, SEXP pvids) {
   IGRAPH_R_CHECK(igraph_cocitation(&g, &m, vs));
 
   PROTECT(result=R_igraph_matrix_to_SEXP(&m));
-  igraph_matrix_destroy(&m);
-  igraph_vector_int_destroy(&vs_data);
+  igraph_matrix_destroy_pv(&m);
+  igraph_vector_int_destroy_pv(&vs_data);
   igraph_vs_destroy(&vs);
 
   UNPROTECT(1);
@@ -4179,8 +4204,8 @@ SEXP R_igraph_bibcoupling(SEXP graph, SEXP pvids) {
   IGRAPH_R_CHECK(igraph_bibcoupling(&g, &m, vs));
 
   PROTECT(result=R_igraph_matrix_to_SEXP(&m));
-  igraph_matrix_destroy(&m);
-  igraph_vector_int_destroy(&vs_data);
+  igraph_matrix_destroy_pv(&m);
+  igraph_vector_int_destroy_pv(&vs_data);
   igraph_vs_destroy(&vs);
 
   UNPROTECT(1);
@@ -4269,9 +4294,9 @@ SEXP R_igraph_shortest_paths(SEXP graph, SEXP pvids, SEXP pto,
     break;
   }
   PROTECT(result=R_igraph_matrix_to_SEXP(&res));
-  igraph_matrix_destroy(&res);
-  igraph_vector_int_destroy(&to_data);
-  igraph_vector_int_destroy(&vs_data);
+  igraph_matrix_destroy_pv(&res);
+  igraph_vector_int_destroy_pv(&to_data);
+  igraph_vector_int_destroy_pv(&vs_data);
   igraph_vs_destroy(&vs);
 
   UNPROTECT(1);
@@ -4300,7 +4325,7 @@ SEXP R_igraph_barabasi_game(SEXP pn, SEXP ppower, SEXP pm, SEXP poutseq,
 
   if (have_outseq) {
     R_SEXP_to_vector_int_copy(poutseq, &outseq);
-    IGRAPH_FINALLY(igraph_vector_int_destroy, &outseq);
+    IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &outseq);
     myoutseq = &outseq;
   }
 
@@ -4313,7 +4338,7 @@ SEXP R_igraph_barabasi_game(SEXP pn, SEXP ppower, SEXP pm, SEXP poutseq,
   PROTECT(result=R_igraph_to_SEXP(&g));
 
   if (have_outseq) {
-    igraph_vector_int_destroy(&outseq);
+    igraph_vector_int_destroy_pv(&outseq);
     IGRAPH_FINALLY_CLEAN(1);
   }
   IGRAPH_I_DESTROY(&g);
@@ -4349,7 +4374,7 @@ SEXP R_igraph_layout_fruchterman_reingold(SEXP graph, SEXP coords,
   } else {
     igraph_matrix_init(&c_coords, 0, 0);
   }
-  IGRAPH_FINALLY(igraph_matrix_destroy, &c_coords);
+  IGRAPH_FINALLY_PV(igraph_matrix_destroy, &c_coords);
   c_niter=(igraph_integer_t) REAL(niter)[0];
   c_start_temp=REAL(start_temp)[0];
   if (!Rf_isNull(weights)) { R_SEXP_to_vector(weights, &c_weights); }
@@ -4362,7 +4387,7 @@ SEXP R_igraph_layout_fruchterman_reingold(SEXP graph, SEXP coords,
 
   /* Convert output */
   PROTECT(coords=R_igraph_matrix_to_SEXP(&c_coords));
-  igraph_matrix_destroy(&c_coords);
+  igraph_matrix_destroy_pv(&c_coords);
   IGRAPH_FINALLY_CLEAN(1);
   result=coords;
 
@@ -4399,7 +4424,7 @@ SEXP R_igraph_layout_fruchterman_reingold_3d(SEXP graph, SEXP coords,
   } else {
     igraph_matrix_init(&c_coords, 0, 0);
   }
-  IGRAPH_FINALLY(igraph_matrix_destroy, &c_coords);
+  IGRAPH_FINALLY_PV(igraph_matrix_destroy, &c_coords);
   c_niter=(igraph_integer_t) REAL(niter)[0];
   c_start_temp=REAL(start_temp)[0];
   if (!Rf_isNull(weights)) { R_SEXP_to_vector(weights, &c_weights); }
@@ -4414,7 +4439,7 @@ SEXP R_igraph_layout_fruchterman_reingold_3d(SEXP graph, SEXP coords,
 
   /* Convert output */
   PROTECT(coords=R_igraph_matrix_to_SEXP(&c_coords));
-  igraph_matrix_destroy(&c_coords);
+  igraph_matrix_destroy_pv(&c_coords);
   IGRAPH_FINALLY_CLEAN(1);
   result=coords;
 
@@ -4449,7 +4474,7 @@ SEXP R_igraph_layout_kamada_kawai(SEXP graph, SEXP coords, SEXP maxiter,
   } else {
     igraph_matrix_init(&c_coords, 0, 0);
   }
-  IGRAPH_FINALLY(igraph_matrix_destroy, &c_coords);
+  IGRAPH_FINALLY_PV(igraph_matrix_destroy, &c_coords);
   c_maxiter=(igraph_integer_t) REAL(maxiter)[0];
   c_epsilon=REAL(epsilon)[0];
   c_kkconst=REAL(kkconst)[0];
@@ -4463,7 +4488,7 @@ SEXP R_igraph_layout_kamada_kawai(SEXP graph, SEXP coords, SEXP maxiter,
 
                                         /* Convert output */
   PROTECT(coords=R_igraph_matrix_to_SEXP(&c_coords));
-  igraph_matrix_destroy(&c_coords);
+  igraph_matrix_destroy_pv(&c_coords);
   IGRAPH_FINALLY_CLEAN(1);
   result=coords;
 
@@ -4502,7 +4527,7 @@ SEXP R_igraph_layout_kamada_kawai_3d(SEXP graph, SEXP coords, SEXP maxiter,
   } else {
     igraph_matrix_init(&c_coords, 0, 0);
   }
-  IGRAPH_FINALLY(igraph_matrix_destroy, &c_coords);
+  IGRAPH_FINALLY_PV(igraph_matrix_destroy, &c_coords);
   c_maxiter=(igraph_integer_t) REAL(maxiter)[0];
   c_epsilon=REAL(epsilon)[0];
   c_kkconst=REAL(kkconst)[0];
@@ -4518,7 +4543,7 @@ SEXP R_igraph_layout_kamada_kawai_3d(SEXP graph, SEXP coords, SEXP maxiter,
 
                                         /* Convert output */
   PROTECT(coords=R_igraph_matrix_to_SEXP(&c_coords));
-  igraph_matrix_destroy(&c_coords);
+  igraph_matrix_destroy_pv(&c_coords);
   IGRAPH_FINALLY_CLEAN(1);
   result=coords;
 
@@ -4548,7 +4573,7 @@ SEXP R_igraph_layout_graphopt(SEXP graph, SEXP pniter, SEXP pcharge,
   }
   IGRAPH_R_CHECK(igraph_layout_graphopt(&g, &res, niter, charge, mass, spring_length, spring_constant, max_sa_movement, !Rf_isNull(start)));
   PROTECT(result=R_igraph_matrix_to_SEXP(&res));
-  igraph_matrix_destroy(&res);
+  igraph_matrix_destroy_pv(&res);
 
   UNPROTECT(1);
   return result;
@@ -4573,7 +4598,7 @@ SEXP R_igraph_layout_lgl(SEXP graph, SEXP pmaxiter, SEXP pmaxdelta,
   igraph_matrix_init(&res, 0, 0);
   IGRAPH_R_CHECK(igraph_layout_lgl(&g, &res, maxiter, maxdelta, area, coolexp, repulserad, cellsize, root));
   PROTECT(result=R_igraph_matrix_to_SEXP(&res));
-  igraph_matrix_destroy(&res);
+  igraph_matrix_destroy_pv(&res);
 
   UNPROTECT(1);
   return result;
@@ -4676,7 +4701,7 @@ SEXP R_igraph_get_shortest_paths(SEXP graph, SEXP pfrom, SEXP pto,
     break;
   }
 
-  igraph_vector_int_destroy(&to_data);
+  igraph_vector_int_destroy_pv(&to_data);
   igraph_vs_destroy(&to);
 
   PROTECT(result=NEW_LIST(4));
@@ -4686,7 +4711,7 @@ SEXP R_igraph_get_shortest_paths(SEXP graph, SEXP pfrom, SEXP pto,
     for (igraph_integer_t i=0; i<no; i++) {
       SET_VECTOR_ELT(result1, i, R_igraph_vector_int_to_SEXP(igraph_vector_int_list_get_ptr(&list, i)));
     }
-    igraph_vector_int_list_destroy(&list);
+    igraph_vector_int_list_destroy_pv(&list);
   } else {
     SET_VECTOR_ELT(result, 0, R_NilValue);
   }
@@ -4696,19 +4721,19 @@ SEXP R_igraph_get_shortest_paths(SEXP graph, SEXP pfrom, SEXP pto,
     for (igraph_integer_t i=0; i<no; i++) {
       SET_VECTOR_ELT(result2, i, R_igraph_vector_int_to_SEXP(igraph_vector_int_list_get_ptr(&elist, i)));
     }
-    igraph_vector_int_list_destroy(&elist);
+    igraph_vector_int_list_destroy_pv(&elist);
   } else {
     SET_VECTOR_ELT(result, 1, R_NilValue);
   }
   if (pred) {
     SET_VECTOR_ELT(result, 2, R_igraph_vector_int_to_SEXP(&predvec));
-    igraph_vector_int_destroy(&predvec);
+    igraph_vector_int_destroy_pv(&predvec);
   } else {
     SET_VECTOR_ELT(result, 2, R_NilValue);
   }
   if (inbound) {
     SET_VECTOR_ELT(result, 3, R_igraph_vector_int_to_SEXP(&inboundvec));
-    igraph_vector_int_destroy(&inboundvec);
+    igraph_vector_int_destroy_pv(&inboundvec);
   } else {
     SET_VECTOR_ELT(result, 3, R_NilValue);
   }
@@ -4806,7 +4831,7 @@ SEXP R_igraph_random_sample(SEXP plow, SEXP phigh, SEXP plength) {
   igraph_vector_int_init(&res, 0);
   IGRAPH_R_CHECK(igraph_random_sample(&res, low, high, length));
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy(&res);
+  igraph_vector_int_destroy_pv(&res);
 
   UNPROTECT(1);
   return result;
@@ -4823,7 +4848,7 @@ SEXP R_igraph_get_edgelist(SEXP graph, SEXP pbycol) {
   igraph_vector_int_init(&res, 0);
   IGRAPH_R_CHECK(igraph_get_edgelist(&g, &res, bycol));
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy(&res);
+  igraph_vector_int_destroy_pv(&res);
 
   UNPROTECT(1);
   return result;
@@ -4843,7 +4868,7 @@ SEXP R_igraph_get_adjacency(SEXP graph, SEXP ptype, SEXP pweights, SEXP ploops)
   igraph_matrix_init(&res, 0, 0);
   IGRAPH_R_CHECK(igraph_get_adjacency(&g, &res, (igraph_get_adjacency_t) type, Rf_isNull(pweights) ? 0 : &weights, loops));
   PROTECT(result=R_igraph_matrix_to_SEXP(&res));
-  igraph_matrix_destroy(&res);
+  igraph_matrix_destroy_pv(&res);
 
   UNPROTECT(1);
   return result;
@@ -4858,17 +4883,17 @@ SEXP R_igraph_degree_sequence_game(SEXP pout_seq, SEXP pin_seq,
   SEXP result;
 
   IGRAPH_R_CHECK(R_SEXP_to_vector_int_copy(pout_seq, &outseq));
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &outseq);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &outseq);
   if (!Rf_isNull(pin_seq)) {
     IGRAPH_R_CHECK(R_SEXP_to_vector_int_copy(pin_seq, &inseq));
   } else {
     IGRAPH_R_CHECK(igraph_vector_int_init(&inseq, 0));
   }
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &inseq);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &inseq);
   IGRAPH_R_CHECK(igraph_degree_sequence_game(&g, &outseq, Rf_isNull(pin_seq) ? 0 : &inseq, (igraph_degseq_t) method));
   PROTECT(result=R_igraph_to_SEXP(&g));
-  igraph_vector_int_destroy(&outseq);
-  igraph_vector_int_destroy(&inseq);
+  igraph_vector_int_destroy_pv(&outseq);
+  igraph_vector_int_destroy_pv(&inseq);
   IGRAPH_FINALLY_CLEAN(2);
   IGRAPH_I_DESTROY(&g);
 
@@ -4885,13 +4910,13 @@ SEXP R_igraph_transitivity_local_undirected_all(SEXP graph, SEXP mode) {
 
   R_SEXP_to_igraph(graph, &g);
   IGRAPH_R_CHECK(igraph_vector_init(&res, 0));
-  IGRAPH_FINALLY(igraph_vector_destroy, &res);
+  IGRAPH_FINALLY_PV(igraph_vector_destroy, &res);
 
   IGRAPH_R_CHECK(igraph_transitivity_local_undirected(&g, &res, igraph_vss_all(), isolates));
 
   PROTECT(result=NEW_NUMERIC(igraph_vector_size(&res)));
   igraph_vector_copy_to(&res, REAL(result));
-  igraph_vector_destroy(&res);
+  igraph_vector_destroy_pv(&res);
   IGRAPH_FINALLY_CLEAN(1);
 
   UNPROTECT(1);
@@ -5405,7 +5430,7 @@ SEXP R_igraph_layout_merge_dla(SEXP graphs, SEXP layouts) {
   igraph_vector_ptr_destroy(&graphvec);
   igraph_matrix_list_destroy(&matrixlist);
   PROTECT(result=R_igraph_matrix_to_SEXP(&res));
-  igraph_matrix_destroy(&res);
+  igraph_matrix_destroy_pv(&res);
 
   UNPROTECT(1);
   return result;
@@ -5464,7 +5489,7 @@ SEXP R_igraph_union(SEXP pgraphs, SEXP pedgemaps) {
   SET_NAMES(result, names);
   IGRAPH_I_DESTROY(&res);
   if (edgemaps) {
-    igraph_vector_int_list_destroy(my_edgemaps);
+    igraph_vector_int_list_destroy_pv(my_edgemaps);
   }
 
   UNPROTECT(2);
@@ -5501,7 +5526,7 @@ SEXP R_igraph_intersection(SEXP pgraphs, SEXP pedgemaps) {
   SET_NAMES(result, names);
   IGRAPH_I_DESTROY(&res);
   if (edgemaps) {
-    igraph_vector_int_list_destroy(my_edgemaps);
+    igraph_vector_int_list_destroy_pv(my_edgemaps);
   }
 
   UNPROTECT(2);
@@ -5553,9 +5578,9 @@ SEXP R_igraph_compose(SEXP pleft, SEXP pright, SEXP pedgemaps) {
   R_SEXP_to_igraph(pright, &right);
   if (edgemaps) {
     igraph_vector_int_init(my_edgemap1, 0);
-    IGRAPH_FINALLY(igraph_vector_int_destroy, my_edgemap1);
+    IGRAPH_FINALLY_PV(igraph_vector_int_destroy, my_edgemap1);
     igraph_vector_int_init(my_edgemap2, 0);
-    IGRAPH_FINALLY(igraph_vector_int_destroy, my_edgemap2);
+    IGRAPH_FINALLY_PV(igraph_vector_int_destroy, my_edgemap2);
   }
   IGRAPH_R_CHECK(igraph_compose(&res, &left, &right, my_edgemap1, my_edgemap2));
   PROTECT(result=NEW_LIST(3));
@@ -5563,13 +5588,13 @@ SEXP R_igraph_compose(SEXP pleft, SEXP pright, SEXP pedgemaps) {
   IGRAPH_I_DESTROY(&res);
   SET_VECTOR_ELT(result, 2, R_igraph_0orvector_int_to_SEXP(my_edgemap2));
   if (edgemaps) {
-    igraph_vector_int_destroy(my_edgemap2);
+    igraph_vector_int_destroy_pv(my_edgemap2);
     IGRAPH_FINALLY_CLEAN(1);
   }
   IGRAPH_I_DESTROY(&res);
   SET_VECTOR_ELT(result, 1, R_igraph_0orvector_int_to_SEXP(my_edgemap1));
   if (edgemaps) {
-    igraph_vector_int_destroy(my_edgemap1);
+    igraph_vector_int_destroy_pv(my_edgemap1);
     IGRAPH_FINALLY_CLEAN(1);
   }
   PROTECT(names=NEW_CHARACTER(3));
@@ -5607,7 +5632,7 @@ SEXP R_igraph_barabasi_aging_game(SEXP pn, SEXP ppa_exp, SEXP paging_exp,
 
   IGRAPH_R_CHECK(igraph_barabasi_aging_game(&g, n, m, &out_seq, out_pref, pa_exp, aging_exp, aging_bin, zero_deg_appeal, zero_age_appeal, deg_coef, age_coef, directed));
   PROTECT(result=R_igraph_to_SEXP(&g));
-  igraph_vector_int_destroy(&out_seq);
+  igraph_vector_int_destroy_pv(&out_seq);
   IGRAPH_I_DESTROY(&g);
 
   UNPROTECT(1);
@@ -5636,7 +5661,7 @@ SEXP R_igraph_recent_degree_aging_game(SEXP pn, SEXP ppa_exp, SEXP paging_exp,
 
   IGRAPH_R_CHECK(igraph_recent_degree_aging_game(&g, n, m, &out_seq, out_pref, pa_exp, aging_exp, aging_bin, time_window, zero_appeal, directed));
   PROTECT(result=R_igraph_to_SEXP(&g));
-  igraph_vector_int_destroy(&out_seq);
+  igraph_vector_int_destroy_pv(&out_seq);
   IGRAPH_I_DESTROY(&g);
 
   UNPROTECT(1);
@@ -5673,8 +5698,8 @@ SEXP R_igraph_edges(SEXP graph, SEXP eids) {
   IGRAPH_R_CHECK(igraph_edges(&g, es, &res));
 
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy(&res);
-  igraph_vector_int_destroy(&es_data);
+  igraph_vector_int_destroy_pv(&res);
+  igraph_vector_int_destroy_pv(&es_data);
   igraph_es_destroy(&es);
 
   UNPROTECT(1);
@@ -5701,8 +5726,8 @@ SEXP R_igraph_constraint(SEXP graph, SEXP vids, SEXP pweights) {
 
   PROTECT(result=NEW_NUMERIC(igraph_vector_size(&res)));
   igraph_vector_copy_to(&res, REAL(result));
-  igraph_vector_destroy(&res);
-  igraph_vector_int_destroy(&vs_data);
+  igraph_vector_destroy_pv(&res);
+  igraph_vector_int_destroy_pv(&vs_data);
   igraph_vs_destroy(&vs);
 
   UNPROTECT(1);
@@ -5724,8 +5749,8 @@ SEXP R_igraph_es_path(SEXP graph, SEXP pp, SEXP pdir) {
   igraph_vector_int_init(&res, 0);
   IGRAPH_R_CHECK(igraph_es_as_vector(&g, es, &res));
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy(&res);
-  igraph_vector_int_destroy(&p);
+  igraph_vector_int_destroy_pv(&res);
+  igraph_vector_int_destroy_pv(&p);
   igraph_es_destroy(&es);
 
   UNPROTECT(1);
@@ -5747,8 +5772,8 @@ SEXP R_igraph_es_pairs(SEXP graph, SEXP pp, SEXP pdir) {
   igraph_vector_int_init(&res, 0);
   IGRAPH_R_CHECK(igraph_es_as_vector(&g, es, &res));
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy(&res);
-  igraph_vector_int_destroy(&p);
+  igraph_vector_int_destroy_pv(&res);
+  igraph_vector_int_destroy_pv(&p);
   igraph_es_destroy(&es);
 
   UNPROTECT(1);
@@ -5776,9 +5801,9 @@ SEXP R_igraph_layout_reingold_tilford(SEXP graph, SEXP proot,
     IGRAPH_R_CHECK(igraph_layout_reingold_tilford_circular(&g, &res, mode, LENGTH(proot)==0 ? 0 : &root, &rootlevel));
   }
   PROTECT(result=R_igraph_matrix_to_SEXP(&res));
-  igraph_matrix_destroy(&res);
-  igraph_vector_int_destroy(&root);
-  igraph_vector_int_destroy(&rootlevel);
+  igraph_matrix_destroy_pv(&res);
+  igraph_vector_int_destroy_pv(&root);
+  igraph_vector_int_destroy_pv(&rootlevel);
 
   UNPROTECT(1);
   return result;
@@ -5885,8 +5910,8 @@ SEXP R_igraph_vs_nei(SEXP graph, SEXP px, SEXP pv, SEXP pmode) {
   }
 
   igraph_vit_destroy(&vv);
-  igraph_vector_int_destroy(&neis);
-  igraph_vector_int_destroy(&v_data);
+  igraph_vector_int_destroy_pv(&neis);
+  igraph_vector_int_destroy_pv(&v_data);
   igraph_vs_destroy(&v);
 
   UNPROTECT(1);
@@ -5924,7 +5949,7 @@ SEXP R_igraph_vs_adj(SEXP graph, SEXP px, SEXP pe, SEXP pmode) {
   }
 
   igraph_eit_destroy(&ee);
-  igraph_vector_int_destroy(&e_data);
+  igraph_vector_int_destroy_pv(&e_data);
   igraph_es_destroy(&e);
 
   UNPROTECT(1);
@@ -5960,9 +5985,9 @@ SEXP R_igraph_es_adj(SEXP graph, SEXP x, SEXP pv, SEXP pmode) {
     IGRAPH_VIT_NEXT(vv);
   }
 
-  igraph_vector_int_destroy(&adje);
+  igraph_vector_int_destroy_pv(&adje);
   igraph_vit_destroy(&vv);
-  igraph_vector_int_destroy(&v_data);
+  igraph_vector_int_destroy_pv(&v_data);
   igraph_vs_destroy(&v);
 
   UNPROTECT(1);
@@ -5992,9 +6017,9 @@ SEXP R_igraph_grg_game(SEXP pn, SEXP pradius, SEXP ptorus,
   SET_VECTOR_ELT(result, 0, R_igraph_to_SEXP(&g));
   IGRAPH_I_DESTROY(&g);
   SET_VECTOR_ELT(result, 1, R_igraph_0orvector_to_SEXP(px));
-  if (coords) { igraph_vector_destroy(px); }
+  if (coords) { igraph_vector_destroy_pv(px); }
   SET_VECTOR_ELT(result, 2, R_igraph_0orvector_to_SEXP(py));
-  if (coords) { igraph_vector_destroy(py); }
+  if (coords) { igraph_vector_destroy_pv(py); }
 
   UNPROTECT(1);
   return result;
@@ -6037,7 +6062,7 @@ SEXP R_igraph_read_graph_dimacs(SEXP pvfile, SEXP pdirected) {
     REAL(VECTOR_ELT(result, 3))[0]=target;
     SET_VECTOR_ELT(result, 4, NEW_NUMERIC(igraph_vector_size(&cap)));
     igraph_vector_copy_to(&cap, REAL(VECTOR_ELT(result,4)));
-    igraph_vector_destroy(&cap);
+    igraph_vector_destroy_pv(&cap);
   } else if (!strcmp(igraph_strvector_get(&problem, 0), "edge")) {
     PROTECT(result=NEW_LIST(3)); px++;
     SET_VECTOR_ELT(result, 0, R_igraph_strvector_to_SEXP(&problem));
@@ -6045,7 +6070,7 @@ SEXP R_igraph_read_graph_dimacs(SEXP pvfile, SEXP pdirected) {
     SET_VECTOR_ELT(result, 1, R_igraph_to_SEXP(&g));
     IGRAPH_I_DESTROY(&g);
     SET_VECTOR_ELT(result, 2, R_igraph_vector_int_to_SEXP(&label));
-    igraph_vector_int_destroy(&label);
+    igraph_vector_int_destroy_pv(&label);
   } else {
     /* This shouldn't happen */
     igraph_error("Invalid DIMACS file (problem) type", __FILE__, __LINE__,
@@ -6122,11 +6147,11 @@ SEXP R_igraph_mincut(SEXP graph, SEXP pcapacity) {
   SET_VECTOR_ELT(result, 0, NEW_NUMERIC(1));
   REAL(VECTOR_ELT(result, 0))[0]=value;
   SET_VECTOR_ELT(result, 1, R_igraph_vector_int_to_SEXP(&cut));
-  igraph_vector_int_destroy(&cut);
+  igraph_vector_int_destroy_pv(&cut);
   SET_VECTOR_ELT(result, 2, R_igraph_vector_int_to_SEXP(&partition));
-  igraph_vector_int_destroy(&partition);
+  igraph_vector_int_destroy_pv(&partition);
   SET_VECTOR_ELT(result, 3, R_igraph_vector_int_to_SEXP(&partition2));
-  igraph_vector_int_destroy(&partition2);
+  igraph_vector_int_destroy_pv(&partition2);
   SET_STRING_ELT(names, 0, Rf_mkChar("value"));
   SET_STRING_ELT(names, 1, Rf_mkChar("cut"));
   SET_STRING_ELT(names, 2, Rf_mkChar("partition1"));
@@ -6362,8 +6387,8 @@ SEXP R_igraph_spinglass_community(SEXP graph, SEXP weights,
   REAL(VECTOR_ELT(result, 2))[0]=modularity;
   REAL(VECTOR_ELT(result, 3))[0]=temperature;
 
-  igraph_vector_int_destroy(&membership);
-  igraph_vector_int_destroy(&csize);
+  igraph_vector_int_destroy_pv(&membership);
+  igraph_vector_int_destroy_pv(&csize);
 
   UNPROTECT(2);
   return result;
@@ -6411,7 +6436,7 @@ SEXP R_igraph_spinglass_my_community(SEXP graph, SEXP weights,
   REAL(VECTOR_ELT(result, 3))[0] = inner_links;
   REAL(VECTOR_ELT(result, 4))[0] = outer_links;
 
-  igraph_vector_int_destroy(&community);
+  igraph_vector_int_destroy_pv(&community);
 
   UNPROTECT(2);
   return result;
@@ -6449,8 +6474,8 @@ SEXP R_igraph_neighborhood_size(SEXP graph, SEXP pvids, SEXP porder,
   igraph_vector_int_init(&res, 0);
   IGRAPH_R_CHECK(igraph_neighborhood_size(&g, &res, vids, order, mode, mindist));
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy(&res);
-  igraph_vector_int_destroy(&vids_data);
+  igraph_vector_int_destroy_pv(&res);
+  igraph_vector_int_destroy_pv(&vids_data);
   igraph_vs_destroy(&vids);
 
   UNPROTECT(1);
@@ -6473,8 +6498,8 @@ SEXP R_igraph_neighborhood(SEXP graph, SEXP pvids, SEXP porder,
   igraph_vector_int_list_init(&res, 0);
   IGRAPH_R_CHECK(igraph_neighborhood(&g, &res, vids, order, mode, mindist));
   PROTECT(result=R_igraph_vector_int_list_to_SEXP(&res));
-  igraph_vector_int_list_destroy(&res);
-  igraph_vector_int_destroy(&vids_data);
+  igraph_vector_int_list_destroy_pv(&res);
+  igraph_vector_int_destroy_pv(&vids_data);
   igraph_vs_destroy(&vids);
 
   UNPROTECT(1);
@@ -6498,7 +6523,7 @@ SEXP R_igraph_neighborhood_graphs(SEXP graph, SEXP pvids, SEXP porder,
   IGRAPH_R_CHECK(igraph_neighborhood_graphs(&g, &res, vids, order, mode, mindist));
   PROTECT(result=R_igraph_graphlist_to_SEXP(&res));
   IGRAPH_FREE(res.stor_begin);
-  igraph_vector_int_destroy(&vids_data);
+  igraph_vector_int_destroy_pv(&vids_data);
   igraph_vs_destroy(&vids);
 
   UNPROTECT(1);
@@ -6554,7 +6579,7 @@ SEXP R_igraph_coreness(SEXP graph, SEXP pmode) {
   IGRAPH_R_CHECK(igraph_coreness(&g, &res, mode));
 
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy(&res);
+  igraph_vector_int_destroy_pv(&res);
 
   UNPROTECT(1);
   return result;
@@ -6576,16 +6601,16 @@ SEXP R_igraph_maximal_cliques(SEXP graph, SEXP psubset,
   } else {
     IGRAPH_R_CHECK(igraph_vector_int_init(&subset, 0));
   }
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &subset);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &subset);
   igraph_vector_int_list_init(&list, 0);
   igraph_maximal_cliques_subset(&g, Rf_isNull(psubset) ? 0 : &subset,
                                 &list, /*no=*/ 0, /*file=*/ 0,
                                 minsize, maxsize);
-  igraph_vector_int_destroy(&subset);
+  igraph_vector_int_destroy_pv(&subset);
   IGRAPH_FINALLY_CLEAN(1);
 
   PROTECT(result=R_igraph_vector_int_list_to_SEXP(&list));
-  igraph_vector_int_list_destroy(&list);
+  igraph_vector_int_list_destroy_pv(&list);
 
   UNPROTECT(1);
   return result;
@@ -6610,7 +6635,7 @@ SEXP R_igraph_maximal_cliques_file(SEXP graph, SEXP psubset, SEXP file,
   } else {
     IGRAPH_R_CHECK(igraph_vector_int_init(&subset, 0));
   }
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &subset);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &subset);
 #if HAVE_OPEN_MEMSTREAM == 1
   stream=open_memstream(&bp, &size);
 #else
@@ -6622,7 +6647,7 @@ SEXP R_igraph_maximal_cliques_file(SEXP graph, SEXP psubset, SEXP file,
                                 /*ptr=*/ 0, /*no=*/ 0, /*file=*/ stream,
                                 minsize, maxsize);
   fclose(stream);
-  igraph_vector_int_destroy(&subset);
+  igraph_vector_int_destroy_pv(&subset);
   IGRAPH_FINALLY_CLEAN(1);
 #if HAVE_OPEN_MEMSTREAM == 1
   PROTECT(result=Rf_allocVector(RAWSXP, size));
@@ -6654,7 +6679,7 @@ SEXP R_igraph_maximal_cliques_count(SEXP graph, SEXP psubset,
   } else {
     IGRAPH_R_CHECK(igraph_vector_int_init(&subset, 0));
   }
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &subset);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &subset);
   c_min_size=REAL(min_size)[0];
   c_max_size=REAL(max_size)[0];
                                         /* Call igraph */
@@ -6662,7 +6687,7 @@ SEXP R_igraph_maximal_cliques_count(SEXP graph, SEXP psubset,
                                 /*ptr=*/ 0, &c_no, /*file=*/ 0,
                                 c_min_size, c_max_size);
 
-  igraph_vector_int_destroy(&subset);
+  igraph_vector_int_destroy_pv(&subset);
   IGRAPH_FINALLY_CLEAN(1);
                                         /* Convert output */
   PROTECT(no=NEW_NUMERIC(1));
@@ -6685,7 +6710,7 @@ SEXP R_igraph_independent_vertex_sets(SEXP graph,
   igraph_vector_int_list_init(&list, 0);
   IGRAPH_R_CHECK(igraph_independent_vertex_sets(&g, &list, minsize, maxsize));
   PROTECT(result=R_igraph_vector_int_list_to_SEXP(&list));
-  igraph_vector_int_list_destroy(&list);
+  igraph_vector_int_list_destroy_pv(&list);
 
   UNPROTECT(1);
   return result;
@@ -6700,7 +6725,7 @@ SEXP R_igraph_largest_independent_vertex_sets(SEXP graph) {
   igraph_vector_int_list_init(&list,0);
   IGRAPH_R_CHECK(igraph_largest_independent_vertex_sets(&g, &list));
   PROTECT(result=R_igraph_vector_int_list_to_SEXP(&list));
-  igraph_vector_int_list_destroy(&list);
+  igraph_vector_int_list_destroy_pv(&list);
 
   UNPROTECT(1);
   return result;
@@ -6715,7 +6740,7 @@ SEXP R_igraph_maximal_independent_vertex_sets(SEXP graph) {
   igraph_vector_int_list_init(&list,0);
   IGRAPH_R_CHECK(igraph_maximal_independent_vertex_sets(&g, &list));
   PROTECT(result=R_igraph_vector_int_list_to_SEXP(&list));
-  igraph_vector_int_list_destroy(&list);
+  igraph_vector_int_list_destroy_pv(&list);
 
   UNPROTECT(1);
   return result;
@@ -6769,7 +6794,7 @@ SEXP R_igraph_cited_type_game(SEXP pnodes, SEXP pedges, SEXP ptypes,
   R_SEXP_to_vector(ppref, &pref);
   IGRAPH_R_CHECK(igraph_cited_type_game(&g, nodes, &types, &pref, edges, directed));
   PROTECT(result=R_igraph_to_SEXP(&g));
-  igraph_vector_int_destroy(&types);
+  igraph_vector_int_destroy_pv(&types);
   IGRAPH_I_DESTROY(&g);
 
   UNPROTECT(1);
@@ -6790,7 +6815,7 @@ SEXP R_igraph_citing_cited_type_game(SEXP pnodes, SEXP ptypes, SEXP ppref,
   R_SEXP_to_matrix(ppref, &pref);
   IGRAPH_R_CHECK(igraph_citing_cited_type_game(&g, nodes, &types, &pref, edges, directed));
   PROTECT(result=R_igraph_to_SEXP(&g));
-  igraph_vector_int_destroy(&types);
+  igraph_vector_int_destroy_pv(&types);
   IGRAPH_I_DESTROY(&g);
 
   UNPROTECT(1);
@@ -6832,13 +6857,13 @@ SEXP R_igraph_walktrap_community(SEXP graph, SEXP pweights,
   } else {
     SET_VECTOR_ELT(result, 1, R_NilValue);
   }
-  igraph_vector_destroy(&modularity);
+  igraph_vector_destroy_pv(&modularity);
   if (LOGICAL(pmembership)[0]) {
     SET_VECTOR_ELT(result, 2, R_igraph_0orvector_int_to_SEXP(&membership));
   } else {
     SET_VECTOR_ELT(result, 2, R_NilValue);
   }
-  igraph_vector_int_destroy(&membership);
+  igraph_vector_int_destroy_pv(&membership);
   PROTECT(names=NEW_CHARACTER(3));
   SET_STRING_ELT(names, 0, Rf_mkChar("merges"));
   SET_STRING_ELT(names, 1, Rf_mkChar("modularity"));
@@ -6860,7 +6885,7 @@ SEXP R_igraph_topological_sorting(SEXP graph, SEXP pmode) {
   IGRAPH_R_CHECK(igraph_topological_sorting(&g, &res, mode));
 
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy(&res);
+  igraph_vector_int_destroy_pv(&res);
 
   UNPROTECT(1);
   return result;
@@ -6911,17 +6936,17 @@ SEXP R_igraph_community_edge_betweenness(SEXP graph, SEXP pweights,
 
   PROTECT(result=NEW_LIST(6));
   SET_VECTOR_ELT(result, 0, R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy(&res);
+  igraph_vector_int_destroy_pv(&res);
   SET_VECTOR_ELT(result, 1, R_igraph_0orvector_to_SEXP(ppeb));
-  if (ppeb) { igraph_vector_destroy(ppeb); }
+  if (ppeb) { igraph_vector_destroy_pv(ppeb); }
   SET_VECTOR_ELT(result, 2, R_igraph_0ormatrix_int_to_SEXP(ppmerges));
   if (ppmerges) { igraph_matrix_int_destroy(ppmerges); }
   SET_VECTOR_ELT(result, 3, R_igraph_0orvector_int_to_SEXP(ppbridges));
-  if (ppbridges) { igraph_vector_int_destroy(ppbridges); }
+  if (ppbridges) { igraph_vector_int_destroy_pv(ppbridges); }
   SET_VECTOR_ELT(result, 4, R_igraph_0orvector_to_SEXP(ppmodularity));
-  if (ppmodularity) { igraph_vector_destroy(ppmodularity); }
+  if (ppmodularity) { igraph_vector_destroy_pv(ppmodularity); }
   SET_VECTOR_ELT(result, 5, R_igraph_0orvector_int_to_SEXP(ppmembership));
-  if (ppmembership) { igraph_vector_int_destroy(ppmembership); }
+  if (ppmembership) { igraph_vector_int_destroy_pv(ppmembership); }
   PROTECT(names=NEW_CHARACTER(6));
   SET_STRING_ELT(names, 0, Rf_mkChar("removed.edges"));
   SET_STRING_ELT(names, 1, Rf_mkChar("edge.betweenness"));
@@ -6967,9 +6992,9 @@ SEXP R_igraph_community_fastgreedy(SEXP graph, SEXP pmerges, SEXP pmodularity,
   SET_VECTOR_ELT(result, 0, R_igraph_0ormatrix_int_to_SEXP(ppmerges));
   if (ppmerges) { igraph_matrix_int_destroy(ppmerges); }
   SET_VECTOR_ELT(result, 1, R_igraph_0orvector_to_SEXP(ppmodularity));
-  if (ppmodularity) { igraph_vector_destroy(ppmodularity); }
+  if (ppmodularity) { igraph_vector_destroy_pv(ppmodularity); }
   SET_VECTOR_ELT(result, 2, R_igraph_0orvector_int_to_SEXP(ppmembership));
-  if (ppmembership) { igraph_vector_int_destroy(ppmembership); }
+  if (ppmembership) { igraph_vector_int_destroy_pv(ppmembership); }
   PROTECT(names=NEW_CHARACTER(3));
   SET_STRING_ELT(names, 0, Rf_mkChar("merges"));
   SET_STRING_ELT(names, 1, Rf_mkChar("modularity"));
@@ -7005,9 +7030,9 @@ SEXP R_igraph_community_to_membership(SEXP graph, SEXP pmerges,
   IGRAPH_R_CHECK(igraph_community_to_membership(&merges, nodes, steps, ppmembership, ppcsize));
   PROTECT(result=NEW_LIST(2));
   SET_VECTOR_ELT(result, 0, R_igraph_0orvector_int_to_SEXP(ppmembership));
-  if (ppmembership) { igraph_vector_int_destroy(ppmembership); }
+  if (ppmembership) { igraph_vector_int_destroy_pv(ppmembership); }
   SET_VECTOR_ELT(result, 1, R_igraph_0orvector_int_to_SEXP(ppcsize));
-  if (ppcsize) { igraph_vector_int_destroy(ppcsize); }
+  if (ppcsize) { igraph_vector_int_destroy_pv(ppcsize); }
   PROTECT(names=NEW_CHARACTER(2));
   SET_STRING_ELT(names, 0, Rf_mkChar("membership"));
   SET_STRING_ELT(names, 1, Rf_mkChar("csize"));
@@ -7030,13 +7055,13 @@ SEXP R_igraph_community_to_membership2(SEXP pmerges, SEXP pvcount,
   IGRAPH_FINALLY(igraph_matrix_int_destroy, &merges);
 
   IGRAPH_R_CHECK(igraph_vector_int_init(&membership, 0));
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &membership);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &membership);
 
   IGRAPH_R_CHECK(igraph_community_to_membership(&merges, vcount, steps, &membership, 0));
   PROTECT(result=R_igraph_vector_int_to_SEXP(&membership));
 
   igraph_matrix_int_destroy(&merges);
-  igraph_vector_int_destroy(&membership);
+  igraph_vector_int_destroy_pv(&membership);
   IGRAPH_FINALLY_CLEAN(2);
 
   UNPROTECT(1);
@@ -7059,7 +7084,7 @@ SEXP R_igraph_girth(SEXP graph, SEXP pcircle) {
   SET_VECTOR_ELT(result, 0, NEW_NUMERIC(1));
   REAL(VECTOR_ELT(result, 0))[0]=girth;
   SET_VECTOR_ELT(result, 1, R_igraph_0orvector_int_to_SEXPp1(ppcircle));
-  if (ppcircle) { igraph_vector_int_destroy(ppcircle); }
+  if (ppcircle) { igraph_vector_int_destroy_pv(ppcircle); }
   PROTECT(names=NEW_CHARACTER(2));
   SET_STRING_ELT(names, 0, Rf_mkChar("girth"));
   SET_STRING_ELT(names, 1, Rf_mkChar("circle"));
@@ -7100,7 +7125,7 @@ SEXP R_igraph_get_adjlist(SEXP graph, SEXP pmode, SEXP ploops, SEXP pmultiple) {
     igraph_i_neighbors(&g, &neis, i, mode, (igraph_loops_t) loops, (igraph_multiple_t) multiple);
     SET_VECTOR_ELT(result, i, R_igraph_vector_int_to_SEXP(&neis));
   }
-  igraph_vector_int_destroy(&neis);
+  igraph_vector_int_destroy_pv(&neis);
 
   UNPROTECT(1);
   return result;
@@ -7123,7 +7148,7 @@ SEXP R_igraph_get_adjedgelist(SEXP graph, SEXP pmode, SEXP ploops) {
     igraph_i_incident(&g, &neis, (igraph_integer_t) i, mode, (igraph_loops_t) loops);
     SET_VECTOR_ELT(result, i, R_igraph_vector_int_to_SEXP(&neis));
   }
-  igraph_vector_int_destroy(&neis);
+  igraph_vector_int_destroy_pv(&neis);
 
   UNPROTECT(1);
   return result;
@@ -7164,17 +7189,17 @@ SEXP R_igraph_arpack(SEXP function, SEXP extra, SEXP options, SEXP rho,
   if (0 != igraph_matrix_init(&vectors, 0, 0)) {
     igraph_error("Cannot run ARPACK", __FILE__, __LINE__, IGRAPH_ENOMEM);
   }
-  IGRAPH_FINALLY(igraph_matrix_destroy, &vectors);
+  IGRAPH_FINALLY_PV(igraph_matrix_destroy, &vectors);
   if (LOGICAL(sym)[0]) {
     if (0 != igraph_vector_init(&values, 0)) {
       igraph_error("Cannot run ARPACK", __FILE__, __LINE__, IGRAPH_ENOMEM);
     }
-    IGRAPH_FINALLY(igraph_vector_destroy, &values);
+    IGRAPH_FINALLY_PV(igraph_vector_destroy, &values);
   } else {
     if (0 != igraph_matrix_init(&values2, 0, 0)) {
       igraph_error("Cannot run ARPACK", __FILE__, __LINE__, IGRAPH_ENOMEM);
     }
-    IGRAPH_FINALLY(igraph_matrix_destroy, &values2);
+    IGRAPH_FINALLY_PV(igraph_matrix_destroy, &values2);
   }
 
   data.fun=function;
@@ -7197,13 +7222,13 @@ SEXP R_igraph_arpack(SEXP function, SEXP extra, SEXP options, SEXP rho,
   PROTECT(result=NEW_LIST(3));
   if (LOGICAL(sym)[0]) {
     SET_VECTOR_ELT(result, 0, R_igraph_vector_to_SEXP(&values));
-    igraph_vector_destroy(&values); IGRAPH_FINALLY_CLEAN(1);
+    igraph_vector_destroy_pv(&values); IGRAPH_FINALLY_CLEAN(1);
   } else {
     SET_VECTOR_ELT(result, 0, R_igraph_matrix_to_SEXP(&values2));
-    igraph_matrix_destroy(&values2); IGRAPH_FINALLY_CLEAN(1);
+    igraph_matrix_destroy_pv(&values2); IGRAPH_FINALLY_CLEAN(1);
   }
   SET_VECTOR_ELT(result, 1, R_igraph_matrix_to_SEXP(&vectors));
-  igraph_matrix_destroy(&vectors); IGRAPH_FINALLY_CLEAN(1);
+  igraph_matrix_destroy_pv(&vectors); IGRAPH_FINALLY_CLEAN(1);
   SET_VECTOR_ELT(result, 2, R_igraph_arpack_options_to_SEXP(&c_options));
   PROTECT(names=NEW_CHARACTER(3));
   SET_STRING_ELT(names, 0, Rf_mkChar("values"));
@@ -7236,7 +7261,7 @@ SEXP R_igraph_is_chordal(SEXP graph, SEXP alpha, SEXP alpham1,
     if (0 != igraph_vector_int_init(&c_fillin, 0)) {
       igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
     }
-    IGRAPH_FINALLY(igraph_vector_int_destroy, &c_fillin);
+    IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &c_fillin);
   }
   IGRAPH_R_CHECK(igraph_is_chordal(&c_graph, (Rf_isNull(alpha) ? 0 : &c_alpha), (Rf_isNull(alpham1) ? 0 : &c_alpham1), &c_chordal, (LOGICAL(pfillin)[0] ? &c_fillin : 0), (LOGICAL(pnewgraph)[0] ? &c_newgraph : 0)));
 
@@ -7247,13 +7272,13 @@ SEXP R_igraph_is_chordal(SEXP graph, SEXP alpha, SEXP alpham1,
   LOGICAL(chordal)[0]=c_chordal;
   if (LOGICAL(pfillin)[0]) {
     PROTECT(fillin=R_igraph_vector_int_to_SEXP(&c_fillin));
-    igraph_vector_int_destroy(&c_fillin);
+    igraph_vector_int_destroy_pv(&c_fillin);
     IGRAPH_FINALLY_CLEAN(1);
   } else {
     PROTECT(fillin=R_NilValue);
   }
   if (LOGICAL(pnewgraph)[0]) {
-    IGRAPH_FINALLY(igraph_destroy, &c_newgraph);
+    IGRAPH_FINALLY_PV(igraph_destroy, &c_newgraph);
     PROTECT(newgraph=R_igraph_to_SEXP(&c_newgraph));
     IGRAPH_I_DESTROY(&c_newgraph);
     IGRAPH_FINALLY_CLEAN(1);
@@ -7338,37 +7363,37 @@ SEXP R_igraph_bfs(SEXP graph, SEXP proot, SEXP proots, SEXP pmode,
   } else {
     igraph_vector_int_init(&roots, 0);
   }
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &roots);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &roots);
 
   if (!Rf_isNull(prestricted)) {
     R_SEXP_to_vector_int_copy(prestricted, &restricted);
   } else {
     igraph_vector_int_init(&restricted, 0);
   }
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &restricted);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &restricted);
 
   if (LOGICAL(porder)[0]) {
-    igraph_vector_int_init(&order, 0); IGRAPH_FINALLY(igraph_vector_int_destroy, &order);
+    igraph_vector_int_init(&order, 0); IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &order);
     p_order=&order;
   }
   if (LOGICAL(prank)[0]) {
-    igraph_vector_int_init(&rank, 0); IGRAPH_FINALLY(igraph_vector_int_destroy, &rank);
+    igraph_vector_int_init(&rank, 0); IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &rank);
     p_rank=&rank;
   }
   if (LOGICAL(pfather)[0]) {
-    igraph_vector_int_init(&father, 0); IGRAPH_FINALLY(igraph_vector_int_destroy, &father);
+    igraph_vector_int_init(&father, 0); IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &father);
     p_father=&father;
   }
   if (LOGICAL(ppred)[0]) {
-    igraph_vector_int_init(&pred, 0); IGRAPH_FINALLY(igraph_vector_int_destroy, &pred);
+    igraph_vector_int_init(&pred, 0); IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &pred);
     p_pred=&pred;
   }
   if (LOGICAL(psucc)[0]) {
-    igraph_vector_int_init(&succ, 0); IGRAPH_FINALLY(igraph_vector_int_destroy, &succ);
+    igraph_vector_int_init(&succ, 0); IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &succ);
     p_succ=&succ;
   }
   if (LOGICAL(pdist)[0]) {
-    igraph_vector_int_init(&dist, 0); IGRAPH_FINALLY(igraph_vector_int_destroy, &dist);
+    igraph_vector_int_init(&dist, 0); IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &dist);
     p_dist=&dist;
   }
 
@@ -7417,17 +7442,17 @@ SEXP R_igraph_bfs(SEXP graph, SEXP proot, SEXP proots, SEXP pmode,
 
   UNPROTECT(2);
 
-  igraph_vector_int_destroy(&roots);
+  igraph_vector_int_destroy_pv(&roots);
   IGRAPH_FINALLY_CLEAN(1);
-  igraph_vector_int_destroy(&restricted);
+  igraph_vector_int_destroy_pv(&restricted);
   IGRAPH_FINALLY_CLEAN(1);
 
-  if (p_dist) { igraph_vector_int_destroy(p_dist); IGRAPH_FINALLY_CLEAN(1); p_dist = 0; }
-  if (p_succ) { igraph_vector_int_destroy(p_succ); IGRAPH_FINALLY_CLEAN(1); p_succ = 0; }
-  if (p_pred) { igraph_vector_int_destroy(p_pred); IGRAPH_FINALLY_CLEAN(1); p_pred = 0; }
-  if (p_father) { igraph_vector_int_destroy(p_father); IGRAPH_FINALLY_CLEAN(1); p_father = 0; }
-  if (p_rank) { igraph_vector_int_destroy(p_rank); IGRAPH_FINALLY_CLEAN(1); p_rank = 0; }
-  if (p_order) { igraph_vector_int_destroy(p_order); IGRAPH_FINALLY_CLEAN(1); p_order = 0; }
+  if (p_dist) { igraph_vector_int_destroy_pv(p_dist); IGRAPH_FINALLY_CLEAN(1); p_dist = 0; }
+  if (p_succ) { igraph_vector_int_destroy_pv(p_succ); IGRAPH_FINALLY_CLEAN(1); p_succ = 0; }
+  if (p_pred) { igraph_vector_int_destroy_pv(p_pred); IGRAPH_FINALLY_CLEAN(1); p_pred = 0; }
+  if (p_father) { igraph_vector_int_destroy_pv(p_father); IGRAPH_FINALLY_CLEAN(1); p_father = 0; }
+  if (p_rank) { igraph_vector_int_destroy_pv(p_rank); IGRAPH_FINALLY_CLEAN(1); p_rank = 0; }
+  if (p_order) { igraph_vector_int_destroy_pv(p_order); IGRAPH_FINALLY_CLEAN(1); p_order = 0; }
 
   return result;
 }
@@ -7577,30 +7602,30 @@ SEXP R_igraph_cohesive_blocks(SEXP graph) {
   if (0 != igraph_vector_int_list_init(&c_blocks, 0)) {
   igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
   }
-  IGRAPH_FINALLY(igraph_vector_int_list_destroy, &c_blocks);
+  IGRAPH_FINALLY_PV(igraph_vector_int_list_destroy, &c_blocks);
   if (0 != igraph_vector_int_init(&c_cohesion, 0)) {
   igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
   }
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &c_cohesion);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &c_cohesion);
   if (0 != igraph_vector_int_init(&c_parent, 0)) {
   igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
   }
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &c_parent);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &c_parent);
 
   IGRAPH_R_CHECK(igraph_cohesive_blocks(&c_graph, &c_blocks, &c_cohesion, &c_parent, &c_blockTree));
 
   PROTECT(result=NEW_LIST(4));
   PROTECT(names=NEW_CHARACTER(4));
   PROTECT(blocks=R_igraph_vector_int_list_to_SEXPp1(&c_blocks));
-  igraph_vector_int_list_destroy(&c_blocks);
+  igraph_vector_int_list_destroy_pv(&c_blocks);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(cohesion=R_igraph_vector_int_to_SEXP(&c_cohesion));
-  igraph_vector_int_destroy(&c_cohesion);
+  igraph_vector_int_destroy_pv(&c_cohesion);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(parent=R_igraph_vector_int_to_SEXPp1(&c_parent));
-  igraph_vector_int_destroy(&c_parent);
+  igraph_vector_int_destroy_pv(&c_parent);
   IGRAPH_FINALLY_CLEAN(1);
-  IGRAPH_FINALLY(igraph_destroy, &c_blockTree);
+  IGRAPH_FINALLY_PV(igraph_destroy, &c_blockTree);
   PROTECT(blockTree=R_igraph_to_SEXP(&c_blockTree));
   IGRAPH_I_DESTROY(&c_blockTree);
   IGRAPH_FINALLY_CLEAN(1);
@@ -7724,7 +7749,7 @@ SEXP R_igraph_community_leading_eigenvector(SEXP graph, SEXP steps,
       igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
     }
   }
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &c_membership);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &c_membership);
   c_steps=(igraph_integer_t) REAL(steps)[0];
   R_SEXP_to_igraph_arpack_options(options, &c_options);
   if (0 != igraph_vector_init(&c_eigenvalues, 0)) {
@@ -7746,17 +7771,17 @@ SEXP R_igraph_community_leading_eigenvector(SEXP graph, SEXP steps,
   igraph_matrix_int_destroy(&c_merges);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(membership=R_igraph_vector_int_to_SEXP(&c_membership));
-  igraph_vector_int_destroy(&c_membership);
+  igraph_vector_int_destroy_pv(&c_membership);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(options=R_igraph_arpack_options_to_SEXP(&c_options));
   PROTECT(modularity=NEW_NUMERIC(1));
   REAL(modularity)[0]=c_modularity;
   PROTECT(eigenvalues=R_igraph_vector_to_SEXP(&c_eigenvalues));
-  igraph_vector_destroy(&c_eigenvalues);
+  igraph_vector_destroy_pv(&c_eigenvalues);
   PROTECT(eigenvectors=R_igraph_vector_list_to_SEXP(&c_eigenvectors));
   igraph_vector_list_destroy(&c_eigenvectors);
   PROTECT(history=R_igraph_vector_to_SEXP(&c_history));
-  igraph_vector_destroy(&c_history);
+  igraph_vector_destroy_pv(&c_history);
   SET_VECTOR_ELT(result, 0, merges);
   SET_VECTOR_ELT(result, 1, membership);
   SET_VECTOR_ELT(result, 2, options);
@@ -7795,8 +7820,8 @@ SEXP R_igraph_get_eids(SEXP graph, SEXP pvp, SEXP pdirected,
   IGRAPH_R_CHECK(igraph_get_eids(&g, &res, /*pairs=*/ &vp, directed, err));
 
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy(&vp);
-  igraph_vector_int_destroy(&res);
+  igraph_vector_int_destroy_pv(&vp);
+  igraph_vector_int_destroy_pv(&res);
 
   UNPROTECT(1);
   return result;
@@ -7830,7 +7855,7 @@ SEXP R_igraph_subisomorphic_lad(SEXP pattern, SEXP target, SEXP domains,
   } else {
     igraph_vector_int_list_init(&c_domains, 0);
   }
-  IGRAPH_FINALLY(igraph_vector_int_list_destroy, &c_domains);
+  IGRAPH_FINALLY_PV(igraph_vector_int_list_destroy, &c_domains);
 
   c_qmap=LOGICAL(pqmap)[0];
   c_qall_maps=LOGICAL(pqall_maps)[0];
@@ -7838,7 +7863,7 @@ SEXP R_igraph_subisomorphic_lad(SEXP pattern, SEXP target, SEXP domains,
     if (0 != igraph_vector_int_init(&c_map, 0)) {
       igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
     }
-    IGRAPH_FINALLY(igraph_vector_int_destroy, &c_map);
+    IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &c_map);
     map=R_GlobalEnv; /* hack to have a non-NULL value */
   } else {
     map=R_NilValue;
@@ -7848,7 +7873,7 @@ SEXP R_igraph_subisomorphic_lad(SEXP pattern, SEXP target, SEXP domains,
     if (0 != igraph_vector_int_list_init(&c_maps, 0)) {
       igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
     }
-    IGRAPH_FINALLY(igraph_vector_int_list_destroy, &c_maps);
+    IGRAPH_FINALLY_PV(igraph_vector_int_list_destroy, &c_maps);
     maps=R_GlobalEnv; /* hack to have a non-NULL value */
   } else {
     maps=R_NilValue;
@@ -7860,7 +7885,7 @@ SEXP R_igraph_subisomorphic_lad(SEXP pattern, SEXP target, SEXP domains,
   IGRAPH_R_CHECK(igraph_subisomorphic_lad(&c_pattern, &c_target, (Rf_isNull(domains) ? 0 : &c_domains), &c_iso, (Rf_isNull(map) ? 0 : &c_map), (Rf_isNull(maps) ? 0 : &c_maps), c_induced, c_time_limit));
 
                                         /* Convert output */
-  igraph_vector_int_list_destroy(&c_domains);
+  igraph_vector_int_list_destroy_pv(&c_domains);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(result=NEW_LIST(3));
   PROTECT(names=NEW_CHARACTER(3));
@@ -7868,14 +7893,14 @@ SEXP R_igraph_subisomorphic_lad(SEXP pattern, SEXP target, SEXP domains,
   LOGICAL(iso)[0]=c_iso;
   if (!Rf_isNull(map)) {
     PROTECT(map=R_igraph_0orvector_int_to_SEXP(&c_map));
-    igraph_vector_int_destroy(&c_map);
+    igraph_vector_int_destroy_pv(&c_map);
     IGRAPH_FINALLY_CLEAN(1);
   } else {
     PROTECT(map=R_NilValue);
   }
   if (!Rf_isNull(maps)) {
     PROTECT(maps=R_igraph_0orvector_int_list_to_SEXP(&c_maps));
-    igraph_vector_int_list_destroy(&c_maps);
+    igraph_vector_int_list_destroy_pv(&c_maps);
     IGRAPH_FINALLY_CLEAN(1);
   } else {
     PROTECT(maps=R_NilValue);
@@ -7913,11 +7938,11 @@ SEXP R_igraph_graphlets(SEXP graph, SEXP weights, SEXP niter) {
   if (0 != igraph_vector_int_list_init(&c_cliques, 0)) {
     igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
   }
-  IGRAPH_FINALLY(igraph_vector_int_list_destroy, &c_cliques);
+  IGRAPH_FINALLY_PV(igraph_vector_int_list_destroy, &c_cliques);
   if (0 != igraph_vector_init(&c_Mu, 0)) {
     igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
   }
-  IGRAPH_FINALLY(igraph_vector_destroy, &c_Mu);
+  IGRAPH_FINALLY_PV(igraph_vector_destroy, &c_Mu);
   c_niter=(igraph_integer_t) REAL(niter)[0];
   /* Call igraph */
   IGRAPH_R_CHECK(igraph_graphlets(&c_graph, (Rf_isNull(weights) ? 0 : &c_weights), &c_cliques, &c_Mu, c_niter));
@@ -7926,10 +7951,10 @@ SEXP R_igraph_graphlets(SEXP graph, SEXP weights, SEXP niter) {
   PROTECT(result=NEW_LIST(2));
   PROTECT(names=NEW_CHARACTER(2));
   PROTECT(cliques=R_igraph_vector_int_list_to_SEXPp1(&c_cliques));
-  igraph_vector_int_list_destroy(&c_cliques);
+  igraph_vector_int_list_destroy_pv(&c_cliques);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(Mu=R_igraph_vector_to_SEXP(&c_Mu));
-  igraph_vector_destroy(&c_Mu);
+  igraph_vector_destroy_pv(&c_Mu);
   IGRAPH_FINALLY_CLEAN(1);
   SET_VECTOR_ELT(result, 0, cliques);
   SET_VECTOR_ELT(result, 1, Mu);
@@ -7962,11 +7987,11 @@ SEXP R_igraph_graphlets_candidate_basis(SEXP graph, SEXP weights) {
   if (0 != igraph_vector_int_list_init(&c_cliques, 0)) {
     igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
   }
-  IGRAPH_FINALLY(igraph_vector_int_list_destroy, &c_cliques);
+  IGRAPH_FINALLY_PV(igraph_vector_int_list_destroy, &c_cliques);
   if (0 != igraph_vector_init(&c_thresholds, 0)) {
     igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
   }
-  IGRAPH_FINALLY(igraph_vector_destroy, &c_thresholds);
+  IGRAPH_FINALLY_PV(igraph_vector_destroy, &c_thresholds);
   /* Call igraph */
   IGRAPH_R_CHECK(igraph_graphlets_candidate_basis(&c_graph, (Rf_isNull(weights) ? 0 : &c_weights), &c_cliques, &c_thresholds));
 
@@ -7974,10 +7999,10 @@ SEXP R_igraph_graphlets_candidate_basis(SEXP graph, SEXP weights) {
   PROTECT(result=NEW_LIST(2));
   PROTECT(names=NEW_CHARACTER(2));
   PROTECT(cliques=R_igraph_vector_int_list_to_SEXPp1(&c_cliques));
-  igraph_vector_int_list_destroy(&c_cliques);
+  igraph_vector_int_list_destroy_pv(&c_cliques);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(thresholds=R_igraph_vector_to_SEXP(&c_thresholds));
-  igraph_vector_destroy(&c_thresholds);
+  igraph_vector_destroy_pv(&c_thresholds);
   IGRAPH_FINALLY_CLEAN(1);
   SET_VECTOR_ELT(result, 0, cliques);
   SET_VECTOR_ELT(result, 1, thresholds);
@@ -8018,11 +8043,11 @@ SEXP R_igraph_graphlets_project(SEXP graph, SEXP weights, SEXP cliques,
   } else {
     igraph_vector_int_list_init(&c_cliques, 0);
   }
-  IGRAPH_FINALLY(igraph_vector_int_list_destroy, &c_cliques);
+  IGRAPH_FINALLY_PV(igraph_vector_int_list_destroy, &c_cliques);
   if (0 != R_SEXP_to_vector_copy(Mu, &c_Mu)) {
     igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
   }
-  IGRAPH_FINALLY(igraph_vector_destroy, &c_Mu);
+  IGRAPH_FINALLY_PV(igraph_vector_destroy, &c_Mu);
   c_niter=(igraph_integer_t) REAL(niter)[0];
 
   /* TODO: Change igraph_i_graphlets_project to igraph_graphlets_project, because
@@ -8035,9 +8060,9 @@ SEXP R_igraph_graphlets_project(SEXP graph, SEXP weights, SEXP cliques,
 
   /* Convert output */
   PROTECT(Mu=R_igraph_vector_to_SEXP(&c_Mu));
-  igraph_vector_int_list_destroy(&c_cliques);
+  igraph_vector_int_list_destroy_pv(&c_cliques);
   IGRAPH_FINALLY_CLEAN(1);
-  igraph_vector_destroy(&c_Mu);
+  igraph_vector_destroy_pv(&c_Mu);
   IGRAPH_FINALLY_CLEAN(1);
   result=Mu;
 
@@ -8080,17 +8105,17 @@ SEXP R_igraph_adjacency_spectral_embedding(SEXP graph, SEXP no,
   if (0 != igraph_matrix_init(&c_X, 0, 0)) {
     igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
   }
-  IGRAPH_FINALLY(igraph_matrix_destroy, &c_X);
+  IGRAPH_FINALLY_PV(igraph_matrix_destroy, &c_X);
   if (directed) {
     if (0 != igraph_matrix_init(&c_Y, 0, 0)) {
       igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
     }
-    IGRAPH_FINALLY(igraph_matrix_destroy, &c_Y);
+    IGRAPH_FINALLY_PV(igraph_matrix_destroy, &c_Y);
   }
   if (0 != igraph_vector_init(&c_D, 0)) {
     igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
   }
-  IGRAPH_FINALLY(igraph_vector_destroy, &c_D);
+  IGRAPH_FINALLY_PV(igraph_vector_destroy, &c_D);
   R_SEXP_to_vector(cvec, &c_cvec);
   R_SEXP_to_igraph_arpack_options(options, &c_options);
 
@@ -8101,17 +8126,17 @@ SEXP R_igraph_adjacency_spectral_embedding(SEXP graph, SEXP no,
   PROTECT(result=NEW_LIST(4));
   PROTECT(names=NEW_CHARACTER(4));
   PROTECT(X=R_igraph_matrix_to_SEXP(&c_X));
-  igraph_matrix_destroy(&c_X);
+  igraph_matrix_destroy_pv(&c_X);
   IGRAPH_FINALLY_CLEAN(1);
   if (directed) {
     PROTECT(Y=R_igraph_matrix_to_SEXP(&c_Y));
-    igraph_matrix_destroy(&c_Y);
+    igraph_matrix_destroy_pv(&c_Y);
     IGRAPH_FINALLY_CLEAN(1);
   } else {
     PROTECT(Y=R_NilValue);
   }
   PROTECT(D=R_igraph_vector_to_SEXP(&c_D));
-  igraph_vector_destroy(&c_D);
+  igraph_vector_destroy_pv(&c_D);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(options=R_igraph_arpack_options_to_SEXP(&c_options));
   SET_VECTOR_ELT(result, 0, X);
@@ -8161,17 +8186,17 @@ SEXP R_igraph_laplacian_spectral_embedding(SEXP graph, SEXP no,
   if (0 != igraph_matrix_init(&c_X, 0, 0)) {
     igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
   }
-  IGRAPH_FINALLY(igraph_matrix_destroy, &c_X);
+  IGRAPH_FINALLY_PV(igraph_matrix_destroy, &c_X);
   if (directed) {
     if (0 != igraph_matrix_init(&c_Y, 0, 0)) {
       igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
     }
-    IGRAPH_FINALLY(igraph_matrix_destroy, &c_Y);
+    IGRAPH_FINALLY_PV(igraph_matrix_destroy, &c_Y);
   }
   if (0 != igraph_vector_init(&c_D, 0)) {
     igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
   }
-  IGRAPH_FINALLY(igraph_vector_destroy, &c_D);
+  IGRAPH_FINALLY_PV(igraph_vector_destroy, &c_D);
   R_SEXP_to_igraph_arpack_options(options, &c_options);
   /* Call igraph */
   IGRAPH_R_CHECK(igraph_laplacian_spectral_embedding(&c_graph, c_no, (Rf_isNull(weights) ? 0 : &c_weights), c_which, c_type, c_scaled, &c_X, directed ? &c_Y : 0, &c_D, &c_options));
@@ -8180,17 +8205,17 @@ SEXP R_igraph_laplacian_spectral_embedding(SEXP graph, SEXP no,
   PROTECT(result=NEW_LIST(4));
   PROTECT(names=NEW_CHARACTER(4));
   PROTECT(X=R_igraph_matrix_to_SEXP(&c_X));
-  igraph_matrix_destroy(&c_X);
+  igraph_matrix_destroy_pv(&c_X);
   IGRAPH_FINALLY_CLEAN(1);
   if (directed) {
     PROTECT(Y=R_igraph_matrix_to_SEXP(&c_Y));
-    igraph_matrix_destroy(&c_Y);
+    igraph_matrix_destroy_pv(&c_Y);
     IGRAPH_FINALLY_CLEAN(1);
   } else {
     PROTECT(Y=R_NilValue);
   }
   PROTECT(D=R_igraph_0orvector_to_SEXP(&c_D));
-  igraph_vector_destroy(&c_D);
+  igraph_vector_destroy_pv(&c_D);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(options=R_igraph_arpack_options_to_SEXP(&c_options));
   SET_VECTOR_ELT(result, 0, X);
@@ -8233,12 +8258,12 @@ SEXP R_igraph_bipartite_projection(SEXP graph, SEXP types, SEXP probe1,
   if (0 != igraph_vector_int_init(&c_multiplicity1, 0)) {
     igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
   }
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &c_multiplicity1);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &c_multiplicity1);
   multiplicity1 = R_GlobalEnv; /* hack to have a non-NULL value */
   if (0 != igraph_vector_int_init(&c_multiplicity2, 0)) {
     igraph_error("", __FILE__, __LINE__, IGRAPH_ENOMEM);
   }
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &c_multiplicity2);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &c_multiplicity2);
   multiplicity2=R_GlobalEnv; /* hack to have a non-NULL value */
   c_probe1=REAL(probe1)[0];
   /* Call igraph */
@@ -8248,7 +8273,7 @@ SEXP R_igraph_bipartite_projection(SEXP graph, SEXP types, SEXP probe1,
   PROTECT(result=NEW_LIST(4));
   PROTECT(names=NEW_CHARACTER(4));
   if (do_1) {
-    IGRAPH_FINALLY(igraph_destroy, &c_proj1);
+    IGRAPH_FINALLY_PV(igraph_destroy, &c_proj1);
     PROTECT(proj1=R_igraph_to_SEXP(&c_proj1));
     IGRAPH_I_DESTROY(&c_proj1);
     IGRAPH_FINALLY_CLEAN(1);
@@ -8256,7 +8281,7 @@ SEXP R_igraph_bipartite_projection(SEXP graph, SEXP types, SEXP probe1,
     PROTECT(proj1=R_NilValue);
   }
   if (do_2) {
-    IGRAPH_FINALLY(igraph_destroy, &c_proj2);
+    IGRAPH_FINALLY_PV(igraph_destroy, &c_proj2);
     PROTECT(proj2=R_igraph_to_SEXP(&c_proj2));
     IGRAPH_I_DESTROY(&c_proj2);
     IGRAPH_FINALLY_CLEAN(1);
@@ -8264,10 +8289,10 @@ SEXP R_igraph_bipartite_projection(SEXP graph, SEXP types, SEXP probe1,
     PROTECT(proj2=R_NilValue);
   }
   PROTECT(multiplicity1=R_igraph_0orvector_int_to_SEXP(&c_multiplicity1));
-  igraph_vector_int_destroy(&c_multiplicity1);
+  igraph_vector_int_destroy_pv(&c_multiplicity1);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(multiplicity2=R_igraph_0orvector_int_to_SEXP(&c_multiplicity2));
-  igraph_vector_int_destroy(&c_multiplicity2);
+  igraph_vector_int_destroy_pv(&c_multiplicity2);
   IGRAPH_FINALLY_CLEAN(1);
   SET_VECTOR_ELT(result, 0, proj1);
   SET_VECTOR_ELT(result, 1, proj2);
@@ -8298,7 +8323,7 @@ SEXP R_igraph_adjacent_vertices(SEXP pgraph, SEXP pv, SEXP pmode) {
   R_SEXP_to_igraph(pgraph, &graph);
   R_SEXP_to_igraph_vs(pv, &graph, &vs, &vs_data);
   IGRAPH_FINALLY(igraph_vs_destroy, &vs);
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &vs_data);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &vs_data);
 
   igraph_vit_create(&graph, vs, &vit);
   IGRAPH_FINALLY(igraph_vit_destroy, &vit);
@@ -8323,7 +8348,7 @@ SEXP R_igraph_adjacent_vertices(SEXP pgraph, SEXP pv, SEXP pmode) {
   igraph_lazy_adjlist_destroy(&adjlist);
   igraph_vit_destroy(&vit);
   igraph_vs_destroy(&vs);
-  igraph_vector_int_destroy(&vs_data);
+  igraph_vector_int_destroy_pv(&vs_data);
   IGRAPH_FINALLY_CLEAN(4);
 
   UNPROTECT(1);
@@ -8344,7 +8369,7 @@ SEXP R_igraph_incident_edges(SEXP pgraph, SEXP pe, SEXP pmode) {
   R_SEXP_to_igraph(pgraph, &graph);
   R_SEXP_to_igraph_vs(pe, &graph, &vs, &vs_data);
   IGRAPH_FINALLY(igraph_vs_destroy, &vs);
-  IGRAPH_FINALLY(igraph_vector_int_destroy, &vs_data);
+  IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &vs_data);
 
   igraph_vit_create(&graph, vs, &vit);
   IGRAPH_FINALLY(igraph_vit_destroy, &vit);
@@ -8365,7 +8390,7 @@ SEXP R_igraph_incident_edges(SEXP pgraph, SEXP pe, SEXP pmode) {
   igraph_lazy_inclist_destroy(&adjlist);
   igraph_vit_destroy(&vit);
   igraph_vs_destroy(&vs);
-  igraph_vector_int_destroy(&vs_data);
+  igraph_vector_int_destroy_pv(&vs_data);
   IGRAPH_FINALLY_CLEAN(4);
 
   UNPROTECT(1);

From 101d518db9f1f33d97e92c1b3385d5ef5d9c9ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <kirill@cynkra.com>
Date: Sun, 5 Jan 2025 20:30:02 +0100
Subject: [PATCH 5/5] Don't call _pv() functions directly

---
 src/rinterface.h       |   1 +
 src/rinterface_extra.c | 318 +++++++++++++++++++++--------------------
 2 files changed, 161 insertions(+), 158 deletions(-)

diff --git a/src/rinterface.h b/src/rinterface.h
index 04e0192e37..e80a49ff99 100644
--- a/src/rinterface.h
+++ b/src/rinterface.h
@@ -130,6 +130,7 @@ igraph_error_t R_SEXP_to_attr_comb(SEXP input, igraph_attribute_combination_t *c
         IGRAPH_FINALLY_REAL((func##_pv), (ptr)); \
     } while (0)
 
+// These functions are never meant to be called directly, only through IGRAPH_FINALLY_PV.
 void igraph_destroy_pv(void *pv_ptr);
 void igraph_matrix_destroy_pv(void *pv_ptr);
 void igraph_vector_destroy_pv(void *pv_ptr);
diff --git a/src/rinterface_extra.c b/src/rinterface_extra.c
index 2014abe438..821e92985c 100644
--- a/src/rinterface_extra.c
+++ b/src/rinterface_extra.c
@@ -99,6 +99,8 @@ void R_check_bool_scalar(SEXP value)
   }
 }
 
+// These functions are never meant to be called directly, only through IGRAPH_FINALLY_PV.
+
 void igraph_destroy_pv(void* pv_ptr)
 {
   igraph_destroy((igraph_t*) pv_ptr);
@@ -650,7 +652,7 @@ igraph_error_t R_igraph_attribute_add_vertices(igraph_t *graph, igraph_integer_t
     val=VECTOR_ELT(attr, 2);
     UNPROTECT(9);
   }
-  igraph_vector_int_destroy_pv(&news);
+  igraph_vector_int_destroy(&news);
   IGRAPH_FINALLY_CLEAN(1);      /* news */
 
   /* Now append the new values */
@@ -987,7 +989,7 @@ igraph_error_t R_igraph_attribute_add_edges(igraph_t *graph, const igraph_vector
     eal=VECTOR_ELT(attr, 3);
     UNPROTECT(9);
   }
-  igraph_vector_int_destroy_pv(&news);
+  igraph_vector_int_destroy(&news);
   IGRAPH_FINALLY_CLEAN(1);
 
   /* Now append the new values */
@@ -1312,7 +1314,7 @@ igraph_error_t R_igraph_attribute_get_numeric_vertex_attr(const igraph_t *graph,
 
   if (igraph_vs_is_all(&vs)) {
     R_SEXP_to_vector_copy(AS_NUMERIC(va), &newvalue);
-    igraph_vector_destroy_pv(value);
+    igraph_vector_destroy(value);
     *value=newvalue;
   } else {
     igraph_vit_t it;
@@ -1360,7 +1362,7 @@ igraph_error_t R_igraph_attribute_get_bool_vertex_attr(const igraph_t *graph,
 
   if (igraph_vs_is_all(&vs)) {
     R_SEXP_to_vector_bool_copy(va, &newvalue);
-    igraph_vector_bool_destroy_pv(value);
+    igraph_vector_bool_destroy(value);
     *value=newvalue;
   } else {
     igraph_vit_t it;
@@ -1437,7 +1439,7 @@ igraph_error_t R_igraph_attribute_get_numeric_edge_attr(const igraph_t *graph,
 
   if (igraph_es_is_all(&es)) {
     R_SEXP_to_vector_copy(AS_NUMERIC(ea), &newvalue);
-    igraph_vector_destroy_pv(value);
+    igraph_vector_destroy(value);
     *value=newvalue;
   } else {
     igraph_eit_t it;
@@ -1485,7 +1487,7 @@ igraph_error_t R_igraph_attribute_get_bool_edge_attr(const igraph_t *graph,
 
   if (igraph_es_is_all(&es)) {
     R_SEXP_to_vector_bool_copy(ea, &newvalue);
-    igraph_vector_bool_destroy_pv(value);
+    igraph_vector_bool_destroy(value);
     *value=newvalue;
   } else {
     igraph_eit_t it;
@@ -2575,7 +2577,7 @@ SEXP R_igraph_0orvector_int_to_SEXP_d(igraph_vector_int_t *v) {
   SEXP result;
   if (v) {
     PROTECT(result=R_igraph_vector_int_to_SEXP(v));
-    igraph_vector_int_destroy_pv(v);
+    igraph_vector_int_destroy(v);
   } else {
     PROTECT(result=R_NilValue);
   }
@@ -2841,9 +2843,9 @@ static igraph_error_t restore_pointer(SEXP graph, igraph_t *g) {
   IGRAPH_FINALLY_PV(igraph_destroy, g);
   IGRAPH_CHECK(igraph_add_edges(g, &edges, NULL));
 
-  igraph_vector_int_destroy_pv(&from);
-  igraph_vector_int_destroy_pv(&to);
-  igraph_vector_int_destroy_pv(&edges);
+  igraph_vector_int_destroy(&from);
+  igraph_vector_int_destroy(&to);
+  igraph_vector_int_destroy(&edges);
   IGRAPH_FINALLY_CLEAN(4); /* +1 for g */
 
   return IGRAPH_SUCCESS;
@@ -3156,10 +3158,10 @@ SEXP R_igraph_arpack_unpack_complex(SEXP vectors, SEXP values, SEXP nev) {
   PROTECT(r_result=NEW_LIST(2));
   PROTECT(r_names=NEW_CHARACTER(2));
   PROTECT(vectors=R_igraph_matrix_to_SEXP(&c_vectors));
-  igraph_matrix_destroy_pv(&c_vectors);
+  igraph_matrix_destroy(&c_vectors);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(values=R_igraph_matrix_to_SEXP(&c_values));
-  igraph_matrix_destroy_pv(&c_values);
+  igraph_matrix_destroy(&c_values);
   IGRAPH_FINALLY_CLEAN(1);
   SET_VECTOR_ELT(r_result, 0, vectors);
   SET_VECTOR_ELT(r_result, 1, values);
@@ -3204,10 +3206,10 @@ void R_igraph_sirlist_destroy(igraph_vector_ptr_t *sl) {
   igraph_integer_t n=igraph_vector_ptr_size(sl);
   for (igraph_integer_t i=0; i<n; i++) {
     igraph_sir_t *sir=VECTOR(*sl)[i];
-    igraph_vector_destroy_pv(&sir->times);
-    igraph_vector_int_destroy_pv(&sir->no_s);
-    igraph_vector_int_destroy_pv(&sir->no_i);
-    igraph_vector_int_destroy_pv(&sir->no_r);
+    igraph_vector_destroy(&sir->times);
+    igraph_vector_int_destroy(&sir->no_s);
+    igraph_vector_int_destroy(&sir->no_i);
+    igraph_vector_int_destroy(&sir->no_r);
     igraph_free(sir);
   }
   igraph_vector_ptr_destroy(sl);
@@ -3242,9 +3244,9 @@ SEXP R_igraph_sparsemat_to_SEXP_triplet(const igraph_sparsemat_t *sp) {
     SET_VECTOR_ELT(res, 3, R_igraph_vector_int_to_SEXP(&j));
     SET_VECTOR_ELT(res, 4, R_igraph_vector_to_SEXP(&x));
 
-    igraph_vector_int_destroy_pv(&i);
-    igraph_vector_int_destroy_pv(&j);
-    igraph_vector_destroy_pv(&x);
+    igraph_vector_int_destroy(&i);
+    igraph_vector_int_destroy(&j);
+    igraph_vector_destroy(&x);
     IGRAPH_FINALLY_CLEAN(3);
   }
 
@@ -3871,7 +3873,7 @@ SEXP R_igraph_add_edges_manual(SEXP graph, SEXP edges) {
   IGRAPH_FINALLY_PV(igraph_destroy, &g);
   IGRAPH_R_CHECK(igraph_add_edges(&g, &v, 0));
   PROTECT(result=R_igraph_to_SEXP(&g));
-  igraph_vector_int_destroy_pv(&v);
+  igraph_vector_int_destroy(&v);
   IGRAPH_FINALLY_CLEAN(1);
   IGRAPH_I_DESTROY(&g);
   IGRAPH_FINALLY_CLEAN(1);
@@ -3925,7 +3927,7 @@ SEXP R_igraph_neighbors(SEXP graph, SEXP pvid, SEXP pmode) {
   IGRAPH_R_CHECK(igraph_neighbors(&g, &neis, (igraph_integer_t) vid, mode));
 
   PROTECT(result=R_igraph_vector_int_to_SEXP(&neis));
-  igraph_vector_int_destroy_pv(&neis);
+  igraph_vector_int_destroy(&neis);
 
   UNPROTECT(1);
   return result;
@@ -3946,7 +3948,7 @@ SEXP R_igraph_incident(SEXP graph, SEXP pvid, SEXP pmode) {
   IGRAPH_R_CHECK(igraph_incident(&g, &neis, (igraph_integer_t) vid, mode));
 
   PROTECT(result=R_igraph_vector_int_to_SEXP(&neis));
-  igraph_vector_int_destroy_pv(&neis);
+  igraph_vector_int_destroy(&neis);
 
   UNPROTECT(1);
   return result;
@@ -3964,7 +3966,7 @@ SEXP R_igraph_delete_edges(SEXP graph, SEXP edges) {
   IGRAPH_R_CHECK(igraph_delete_edges(&g, es));
   PROTECT(result=R_igraph_to_SEXP(&g));
   IGRAPH_I_DESTROY(&g);
-  igraph_vector_int_destroy_pv(&es_data);
+  igraph_vector_int_destroy(&es_data);
   igraph_es_destroy(&es);
 
   UNPROTECT(1);
@@ -3983,7 +3985,7 @@ SEXP R_igraph_delete_vertices(SEXP graph, SEXP vertices) {
   IGRAPH_R_CHECK(igraph_delete_vertices(&g, vs));
   PROTECT(result=R_igraph_to_SEXP(&g));
   IGRAPH_I_DESTROY(&g);
-  igraph_vector_int_destroy_pv(&vs_data);
+  igraph_vector_int_destroy(&vs_data);
   igraph_vs_destroy(&vs);
 
   UNPROTECT(1);
@@ -4021,7 +4023,7 @@ SEXP R_igraph_create(SEXP edges, SEXP pn, SEXP pdirected) {
   IGRAPH_R_CHECK(igraph_create(&g, &v, n, directed));
   PROTECT(result=R_igraph_to_SEXP(&g));
   IGRAPH_I_DESTROY(&g);
-  igraph_vector_int_destroy_pv(&v);
+  igraph_vector_int_destroy(&v);
 
   UNPROTECT(1);
   return result;
@@ -4043,8 +4045,8 @@ SEXP R_igraph_degree(SEXP graph, SEXP vids, SEXP pmode, SEXP ploops) {
   IGRAPH_R_CHECK(igraph_degree(&g, &res, vs, mode, loops));
 
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy_pv(&res);
-  igraph_vector_int_destroy_pv(&vs_data);
+  igraph_vector_int_destroy(&res);
+  igraph_vector_int_destroy(&vs_data);
   igraph_vs_destroy(&vs);
 
   UNPROTECT(1);
@@ -4093,7 +4095,7 @@ SEXP R_igraph_get_diameter(SEXP graph, SEXP pdirected, SEXP punconnected,
   IGRAPH_R_CHECK(igraph_diameter_dijkstra(&g, Rf_isNull(pweights) ? 0 : &weights, &dialen, 0, 0, &res, 0, directed, unconnected));
 
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy_pv(&res);
+  igraph_vector_int_destroy(&res);
 
   UNPROTECT(1);
   return result;
@@ -4142,7 +4144,7 @@ SEXP R_igraph_subcomponent(SEXP graph, SEXP pvertex, SEXP pmode) {
   IGRAPH_R_CHECK(igraph_subcomponent(&g, &res, vertex, mode));
 
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy_pv(&res);
+  igraph_vector_int_destroy(&res);
 
   UNPROTECT(1);
   return result;
@@ -4162,7 +4164,7 @@ SEXP R_igraph_running_mean(SEXP pdata, SEXP pbinwidth) {
 
   PROTECT(result=NEW_NUMERIC(igraph_vector_size(&res)));
   igraph_vector_copy_to(&res, REAL(result));
-  igraph_vector_destroy_pv(&res);
+  igraph_vector_destroy(&res);
 
   UNPROTECT(1);
   return result;
@@ -4182,8 +4184,8 @@ SEXP R_igraph_cocitation(SEXP graph, SEXP pvids) {
   IGRAPH_R_CHECK(igraph_cocitation(&g, &m, vs));
 
   PROTECT(result=R_igraph_matrix_to_SEXP(&m));
-  igraph_matrix_destroy_pv(&m);
-  igraph_vector_int_destroy_pv(&vs_data);
+  igraph_matrix_destroy(&m);
+  igraph_vector_int_destroy(&vs_data);
   igraph_vs_destroy(&vs);
 
   UNPROTECT(1);
@@ -4204,8 +4206,8 @@ SEXP R_igraph_bibcoupling(SEXP graph, SEXP pvids) {
   IGRAPH_R_CHECK(igraph_bibcoupling(&g, &m, vs));
 
   PROTECT(result=R_igraph_matrix_to_SEXP(&m));
-  igraph_matrix_destroy_pv(&m);
-  igraph_vector_int_destroy_pv(&vs_data);
+  igraph_matrix_destroy(&m);
+  igraph_vector_int_destroy(&vs_data);
   igraph_vs_destroy(&vs);
 
   UNPROTECT(1);
@@ -4294,9 +4296,9 @@ SEXP R_igraph_shortest_paths(SEXP graph, SEXP pvids, SEXP pto,
     break;
   }
   PROTECT(result=R_igraph_matrix_to_SEXP(&res));
-  igraph_matrix_destroy_pv(&res);
-  igraph_vector_int_destroy_pv(&to_data);
-  igraph_vector_int_destroy_pv(&vs_data);
+  igraph_matrix_destroy(&res);
+  igraph_vector_int_destroy(&to_data);
+  igraph_vector_int_destroy(&vs_data);
   igraph_vs_destroy(&vs);
 
   UNPROTECT(1);
@@ -4338,7 +4340,7 @@ SEXP R_igraph_barabasi_game(SEXP pn, SEXP ppower, SEXP pm, SEXP poutseq,
   PROTECT(result=R_igraph_to_SEXP(&g));
 
   if (have_outseq) {
-    igraph_vector_int_destroy_pv(&outseq);
+    igraph_vector_int_destroy(&outseq);
     IGRAPH_FINALLY_CLEAN(1);
   }
   IGRAPH_I_DESTROY(&g);
@@ -4387,7 +4389,7 @@ SEXP R_igraph_layout_fruchterman_reingold(SEXP graph, SEXP coords,
 
   /* Convert output */
   PROTECT(coords=R_igraph_matrix_to_SEXP(&c_coords));
-  igraph_matrix_destroy_pv(&c_coords);
+  igraph_matrix_destroy(&c_coords);
   IGRAPH_FINALLY_CLEAN(1);
   result=coords;
 
@@ -4439,7 +4441,7 @@ SEXP R_igraph_layout_fruchterman_reingold_3d(SEXP graph, SEXP coords,
 
   /* Convert output */
   PROTECT(coords=R_igraph_matrix_to_SEXP(&c_coords));
-  igraph_matrix_destroy_pv(&c_coords);
+  igraph_matrix_destroy(&c_coords);
   IGRAPH_FINALLY_CLEAN(1);
   result=coords;
 
@@ -4488,7 +4490,7 @@ SEXP R_igraph_layout_kamada_kawai(SEXP graph, SEXP coords, SEXP maxiter,
 
                                         /* Convert output */
   PROTECT(coords=R_igraph_matrix_to_SEXP(&c_coords));
-  igraph_matrix_destroy_pv(&c_coords);
+  igraph_matrix_destroy(&c_coords);
   IGRAPH_FINALLY_CLEAN(1);
   result=coords;
 
@@ -4543,7 +4545,7 @@ SEXP R_igraph_layout_kamada_kawai_3d(SEXP graph, SEXP coords, SEXP maxiter,
 
                                         /* Convert output */
   PROTECT(coords=R_igraph_matrix_to_SEXP(&c_coords));
-  igraph_matrix_destroy_pv(&c_coords);
+  igraph_matrix_destroy(&c_coords);
   IGRAPH_FINALLY_CLEAN(1);
   result=coords;
 
@@ -4573,7 +4575,7 @@ SEXP R_igraph_layout_graphopt(SEXP graph, SEXP pniter, SEXP pcharge,
   }
   IGRAPH_R_CHECK(igraph_layout_graphopt(&g, &res, niter, charge, mass, spring_length, spring_constant, max_sa_movement, !Rf_isNull(start)));
   PROTECT(result=R_igraph_matrix_to_SEXP(&res));
-  igraph_matrix_destroy_pv(&res);
+  igraph_matrix_destroy(&res);
 
   UNPROTECT(1);
   return result;
@@ -4598,7 +4600,7 @@ SEXP R_igraph_layout_lgl(SEXP graph, SEXP pmaxiter, SEXP pmaxdelta,
   igraph_matrix_init(&res, 0, 0);
   IGRAPH_R_CHECK(igraph_layout_lgl(&g, &res, maxiter, maxdelta, area, coolexp, repulserad, cellsize, root));
   PROTECT(result=R_igraph_matrix_to_SEXP(&res));
-  igraph_matrix_destroy_pv(&res);
+  igraph_matrix_destroy(&res);
 
   UNPROTECT(1);
   return result;
@@ -4701,7 +4703,7 @@ SEXP R_igraph_get_shortest_paths(SEXP graph, SEXP pfrom, SEXP pto,
     break;
   }
 
-  igraph_vector_int_destroy_pv(&to_data);
+  igraph_vector_int_destroy(&to_data);
   igraph_vs_destroy(&to);
 
   PROTECT(result=NEW_LIST(4));
@@ -4711,7 +4713,7 @@ SEXP R_igraph_get_shortest_paths(SEXP graph, SEXP pfrom, SEXP pto,
     for (igraph_integer_t i=0; i<no; i++) {
       SET_VECTOR_ELT(result1, i, R_igraph_vector_int_to_SEXP(igraph_vector_int_list_get_ptr(&list, i)));
     }
-    igraph_vector_int_list_destroy_pv(&list);
+    igraph_vector_int_list_destroy(&list);
   } else {
     SET_VECTOR_ELT(result, 0, R_NilValue);
   }
@@ -4721,19 +4723,19 @@ SEXP R_igraph_get_shortest_paths(SEXP graph, SEXP pfrom, SEXP pto,
     for (igraph_integer_t i=0; i<no; i++) {
       SET_VECTOR_ELT(result2, i, R_igraph_vector_int_to_SEXP(igraph_vector_int_list_get_ptr(&elist, i)));
     }
-    igraph_vector_int_list_destroy_pv(&elist);
+    igraph_vector_int_list_destroy(&elist);
   } else {
     SET_VECTOR_ELT(result, 1, R_NilValue);
   }
   if (pred) {
     SET_VECTOR_ELT(result, 2, R_igraph_vector_int_to_SEXP(&predvec));
-    igraph_vector_int_destroy_pv(&predvec);
+    igraph_vector_int_destroy(&predvec);
   } else {
     SET_VECTOR_ELT(result, 2, R_NilValue);
   }
   if (inbound) {
     SET_VECTOR_ELT(result, 3, R_igraph_vector_int_to_SEXP(&inboundvec));
-    igraph_vector_int_destroy_pv(&inboundvec);
+    igraph_vector_int_destroy(&inboundvec);
   } else {
     SET_VECTOR_ELT(result, 3, R_NilValue);
   }
@@ -4831,7 +4833,7 @@ SEXP R_igraph_random_sample(SEXP plow, SEXP phigh, SEXP plength) {
   igraph_vector_int_init(&res, 0);
   IGRAPH_R_CHECK(igraph_random_sample(&res, low, high, length));
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy_pv(&res);
+  igraph_vector_int_destroy(&res);
 
   UNPROTECT(1);
   return result;
@@ -4848,7 +4850,7 @@ SEXP R_igraph_get_edgelist(SEXP graph, SEXP pbycol) {
   igraph_vector_int_init(&res, 0);
   IGRAPH_R_CHECK(igraph_get_edgelist(&g, &res, bycol));
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy_pv(&res);
+  igraph_vector_int_destroy(&res);
 
   UNPROTECT(1);
   return result;
@@ -4868,7 +4870,7 @@ SEXP R_igraph_get_adjacency(SEXP graph, SEXP ptype, SEXP pweights, SEXP ploops)
   igraph_matrix_init(&res, 0, 0);
   IGRAPH_R_CHECK(igraph_get_adjacency(&g, &res, (igraph_get_adjacency_t) type, Rf_isNull(pweights) ? 0 : &weights, loops));
   PROTECT(result=R_igraph_matrix_to_SEXP(&res));
-  igraph_matrix_destroy_pv(&res);
+  igraph_matrix_destroy(&res);
 
   UNPROTECT(1);
   return result;
@@ -4892,8 +4894,8 @@ SEXP R_igraph_degree_sequence_game(SEXP pout_seq, SEXP pin_seq,
   IGRAPH_FINALLY_PV(igraph_vector_int_destroy, &inseq);
   IGRAPH_R_CHECK(igraph_degree_sequence_game(&g, &outseq, Rf_isNull(pin_seq) ? 0 : &inseq, (igraph_degseq_t) method));
   PROTECT(result=R_igraph_to_SEXP(&g));
-  igraph_vector_int_destroy_pv(&outseq);
-  igraph_vector_int_destroy_pv(&inseq);
+  igraph_vector_int_destroy(&outseq);
+  igraph_vector_int_destroy(&inseq);
   IGRAPH_FINALLY_CLEAN(2);
   IGRAPH_I_DESTROY(&g);
 
@@ -4916,7 +4918,7 @@ SEXP R_igraph_transitivity_local_undirected_all(SEXP graph, SEXP mode) {
 
   PROTECT(result=NEW_NUMERIC(igraph_vector_size(&res)));
   igraph_vector_copy_to(&res, REAL(result));
-  igraph_vector_destroy_pv(&res);
+  igraph_vector_destroy(&res);
   IGRAPH_FINALLY_CLEAN(1);
 
   UNPROTECT(1);
@@ -5430,7 +5432,7 @@ SEXP R_igraph_layout_merge_dla(SEXP graphs, SEXP layouts) {
   igraph_vector_ptr_destroy(&graphvec);
   igraph_matrix_list_destroy(&matrixlist);
   PROTECT(result=R_igraph_matrix_to_SEXP(&res));
-  igraph_matrix_destroy_pv(&res);
+  igraph_matrix_destroy(&res);
 
   UNPROTECT(1);
   return result;
@@ -5489,7 +5491,7 @@ SEXP R_igraph_union(SEXP pgraphs, SEXP pedgemaps) {
   SET_NAMES(result, names);
   IGRAPH_I_DESTROY(&res);
   if (edgemaps) {
-    igraph_vector_int_list_destroy_pv(my_edgemaps);
+    igraph_vector_int_list_destroy(my_edgemaps);
   }
 
   UNPROTECT(2);
@@ -5526,7 +5528,7 @@ SEXP R_igraph_intersection(SEXP pgraphs, SEXP pedgemaps) {
   SET_NAMES(result, names);
   IGRAPH_I_DESTROY(&res);
   if (edgemaps) {
-    igraph_vector_int_list_destroy_pv(my_edgemaps);
+    igraph_vector_int_list_destroy(my_edgemaps);
   }
 
   UNPROTECT(2);
@@ -5588,13 +5590,13 @@ SEXP R_igraph_compose(SEXP pleft, SEXP pright, SEXP pedgemaps) {
   IGRAPH_I_DESTROY(&res);
   SET_VECTOR_ELT(result, 2, R_igraph_0orvector_int_to_SEXP(my_edgemap2));
   if (edgemaps) {
-    igraph_vector_int_destroy_pv(my_edgemap2);
+    igraph_vector_int_destroy(my_edgemap2);
     IGRAPH_FINALLY_CLEAN(1);
   }
   IGRAPH_I_DESTROY(&res);
   SET_VECTOR_ELT(result, 1, R_igraph_0orvector_int_to_SEXP(my_edgemap1));
   if (edgemaps) {
-    igraph_vector_int_destroy_pv(my_edgemap1);
+    igraph_vector_int_destroy(my_edgemap1);
     IGRAPH_FINALLY_CLEAN(1);
   }
   PROTECT(names=NEW_CHARACTER(3));
@@ -5632,7 +5634,7 @@ SEXP R_igraph_barabasi_aging_game(SEXP pn, SEXP ppa_exp, SEXP paging_exp,
 
   IGRAPH_R_CHECK(igraph_barabasi_aging_game(&g, n, m, &out_seq, out_pref, pa_exp, aging_exp, aging_bin, zero_deg_appeal, zero_age_appeal, deg_coef, age_coef, directed));
   PROTECT(result=R_igraph_to_SEXP(&g));
-  igraph_vector_int_destroy_pv(&out_seq);
+  igraph_vector_int_destroy(&out_seq);
   IGRAPH_I_DESTROY(&g);
 
   UNPROTECT(1);
@@ -5661,7 +5663,7 @@ SEXP R_igraph_recent_degree_aging_game(SEXP pn, SEXP ppa_exp, SEXP paging_exp,
 
   IGRAPH_R_CHECK(igraph_recent_degree_aging_game(&g, n, m, &out_seq, out_pref, pa_exp, aging_exp, aging_bin, time_window, zero_appeal, directed));
   PROTECT(result=R_igraph_to_SEXP(&g));
-  igraph_vector_int_destroy_pv(&out_seq);
+  igraph_vector_int_destroy(&out_seq);
   IGRAPH_I_DESTROY(&g);
 
   UNPROTECT(1);
@@ -5698,8 +5700,8 @@ SEXP R_igraph_edges(SEXP graph, SEXP eids) {
   IGRAPH_R_CHECK(igraph_edges(&g, es, &res));
 
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy_pv(&res);
-  igraph_vector_int_destroy_pv(&es_data);
+  igraph_vector_int_destroy(&res);
+  igraph_vector_int_destroy(&es_data);
   igraph_es_destroy(&es);
 
   UNPROTECT(1);
@@ -5726,8 +5728,8 @@ SEXP R_igraph_constraint(SEXP graph, SEXP vids, SEXP pweights) {
 
   PROTECT(result=NEW_NUMERIC(igraph_vector_size(&res)));
   igraph_vector_copy_to(&res, REAL(result));
-  igraph_vector_destroy_pv(&res);
-  igraph_vector_int_destroy_pv(&vs_data);
+  igraph_vector_destroy(&res);
+  igraph_vector_int_destroy(&vs_data);
   igraph_vs_destroy(&vs);
 
   UNPROTECT(1);
@@ -5749,8 +5751,8 @@ SEXP R_igraph_es_path(SEXP graph, SEXP pp, SEXP pdir) {
   igraph_vector_int_init(&res, 0);
   IGRAPH_R_CHECK(igraph_es_as_vector(&g, es, &res));
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy_pv(&res);
-  igraph_vector_int_destroy_pv(&p);
+  igraph_vector_int_destroy(&res);
+  igraph_vector_int_destroy(&p);
   igraph_es_destroy(&es);
 
   UNPROTECT(1);
@@ -5772,8 +5774,8 @@ SEXP R_igraph_es_pairs(SEXP graph, SEXP pp, SEXP pdir) {
   igraph_vector_int_init(&res, 0);
   IGRAPH_R_CHECK(igraph_es_as_vector(&g, es, &res));
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy_pv(&res);
-  igraph_vector_int_destroy_pv(&p);
+  igraph_vector_int_destroy(&res);
+  igraph_vector_int_destroy(&p);
   igraph_es_destroy(&es);
 
   UNPROTECT(1);
@@ -5801,9 +5803,9 @@ SEXP R_igraph_layout_reingold_tilford(SEXP graph, SEXP proot,
     IGRAPH_R_CHECK(igraph_layout_reingold_tilford_circular(&g, &res, mode, LENGTH(proot)==0 ? 0 : &root, &rootlevel));
   }
   PROTECT(result=R_igraph_matrix_to_SEXP(&res));
-  igraph_matrix_destroy_pv(&res);
-  igraph_vector_int_destroy_pv(&root);
-  igraph_vector_int_destroy_pv(&rootlevel);
+  igraph_matrix_destroy(&res);
+  igraph_vector_int_destroy(&root);
+  igraph_vector_int_destroy(&rootlevel);
 
   UNPROTECT(1);
   return result;
@@ -5910,8 +5912,8 @@ SEXP R_igraph_vs_nei(SEXP graph, SEXP px, SEXP pv, SEXP pmode) {
   }
 
   igraph_vit_destroy(&vv);
-  igraph_vector_int_destroy_pv(&neis);
-  igraph_vector_int_destroy_pv(&v_data);
+  igraph_vector_int_destroy(&neis);
+  igraph_vector_int_destroy(&v_data);
   igraph_vs_destroy(&v);
 
   UNPROTECT(1);
@@ -5949,7 +5951,7 @@ SEXP R_igraph_vs_adj(SEXP graph, SEXP px, SEXP pe, SEXP pmode) {
   }
 
   igraph_eit_destroy(&ee);
-  igraph_vector_int_destroy_pv(&e_data);
+  igraph_vector_int_destroy(&e_data);
   igraph_es_destroy(&e);
 
   UNPROTECT(1);
@@ -5985,9 +5987,9 @@ SEXP R_igraph_es_adj(SEXP graph, SEXP x, SEXP pv, SEXP pmode) {
     IGRAPH_VIT_NEXT(vv);
   }
 
-  igraph_vector_int_destroy_pv(&adje);
+  igraph_vector_int_destroy(&adje);
   igraph_vit_destroy(&vv);
-  igraph_vector_int_destroy_pv(&v_data);
+  igraph_vector_int_destroy(&v_data);
   igraph_vs_destroy(&v);
 
   UNPROTECT(1);
@@ -6017,9 +6019,9 @@ SEXP R_igraph_grg_game(SEXP pn, SEXP pradius, SEXP ptorus,
   SET_VECTOR_ELT(result, 0, R_igraph_to_SEXP(&g));
   IGRAPH_I_DESTROY(&g);
   SET_VECTOR_ELT(result, 1, R_igraph_0orvector_to_SEXP(px));
-  if (coords) { igraph_vector_destroy_pv(px); }
+  if (coords) { igraph_vector_destroy(px); }
   SET_VECTOR_ELT(result, 2, R_igraph_0orvector_to_SEXP(py));
-  if (coords) { igraph_vector_destroy_pv(py); }
+  if (coords) { igraph_vector_destroy(py); }
 
   UNPROTECT(1);
   return result;
@@ -6062,7 +6064,7 @@ SEXP R_igraph_read_graph_dimacs(SEXP pvfile, SEXP pdirected) {
     REAL(VECTOR_ELT(result, 3))[0]=target;
     SET_VECTOR_ELT(result, 4, NEW_NUMERIC(igraph_vector_size(&cap)));
     igraph_vector_copy_to(&cap, REAL(VECTOR_ELT(result,4)));
-    igraph_vector_destroy_pv(&cap);
+    igraph_vector_destroy(&cap);
   } else if (!strcmp(igraph_strvector_get(&problem, 0), "edge")) {
     PROTECT(result=NEW_LIST(3)); px++;
     SET_VECTOR_ELT(result, 0, R_igraph_strvector_to_SEXP(&problem));
@@ -6070,7 +6072,7 @@ SEXP R_igraph_read_graph_dimacs(SEXP pvfile, SEXP pdirected) {
     SET_VECTOR_ELT(result, 1, R_igraph_to_SEXP(&g));
     IGRAPH_I_DESTROY(&g);
     SET_VECTOR_ELT(result, 2, R_igraph_vector_int_to_SEXP(&label));
-    igraph_vector_int_destroy_pv(&label);
+    igraph_vector_int_destroy(&label);
   } else {
     /* This shouldn't happen */
     igraph_error("Invalid DIMACS file (problem) type", __FILE__, __LINE__,
@@ -6147,11 +6149,11 @@ SEXP R_igraph_mincut(SEXP graph, SEXP pcapacity) {
   SET_VECTOR_ELT(result, 0, NEW_NUMERIC(1));
   REAL(VECTOR_ELT(result, 0))[0]=value;
   SET_VECTOR_ELT(result, 1, R_igraph_vector_int_to_SEXP(&cut));
-  igraph_vector_int_destroy_pv(&cut);
+  igraph_vector_int_destroy(&cut);
   SET_VECTOR_ELT(result, 2, R_igraph_vector_int_to_SEXP(&partition));
-  igraph_vector_int_destroy_pv(&partition);
+  igraph_vector_int_destroy(&partition);
   SET_VECTOR_ELT(result, 3, R_igraph_vector_int_to_SEXP(&partition2));
-  igraph_vector_int_destroy_pv(&partition2);
+  igraph_vector_int_destroy(&partition2);
   SET_STRING_ELT(names, 0, Rf_mkChar("value"));
   SET_STRING_ELT(names, 1, Rf_mkChar("cut"));
   SET_STRING_ELT(names, 2, Rf_mkChar("partition1"));
@@ -6387,8 +6389,8 @@ SEXP R_igraph_spinglass_community(SEXP graph, SEXP weights,
   REAL(VECTOR_ELT(result, 2))[0]=modularity;
   REAL(VECTOR_ELT(result, 3))[0]=temperature;
 
-  igraph_vector_int_destroy_pv(&membership);
-  igraph_vector_int_destroy_pv(&csize);
+  igraph_vector_int_destroy(&membership);
+  igraph_vector_int_destroy(&csize);
 
   UNPROTECT(2);
   return result;
@@ -6436,7 +6438,7 @@ SEXP R_igraph_spinglass_my_community(SEXP graph, SEXP weights,
   REAL(VECTOR_ELT(result, 3))[0] = inner_links;
   REAL(VECTOR_ELT(result, 4))[0] = outer_links;
 
-  igraph_vector_int_destroy_pv(&community);
+  igraph_vector_int_destroy(&community);
 
   UNPROTECT(2);
   return result;
@@ -6474,8 +6476,8 @@ SEXP R_igraph_neighborhood_size(SEXP graph, SEXP pvids, SEXP porder,
   igraph_vector_int_init(&res, 0);
   IGRAPH_R_CHECK(igraph_neighborhood_size(&g, &res, vids, order, mode, mindist));
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy_pv(&res);
-  igraph_vector_int_destroy_pv(&vids_data);
+  igraph_vector_int_destroy(&res);
+  igraph_vector_int_destroy(&vids_data);
   igraph_vs_destroy(&vids);
 
   UNPROTECT(1);
@@ -6498,8 +6500,8 @@ SEXP R_igraph_neighborhood(SEXP graph, SEXP pvids, SEXP porder,
   igraph_vector_int_list_init(&res, 0);
   IGRAPH_R_CHECK(igraph_neighborhood(&g, &res, vids, order, mode, mindist));
   PROTECT(result=R_igraph_vector_int_list_to_SEXP(&res));
-  igraph_vector_int_list_destroy_pv(&res);
-  igraph_vector_int_destroy_pv(&vids_data);
+  igraph_vector_int_list_destroy(&res);
+  igraph_vector_int_destroy(&vids_data);
   igraph_vs_destroy(&vids);
 
   UNPROTECT(1);
@@ -6523,7 +6525,7 @@ SEXP R_igraph_neighborhood_graphs(SEXP graph, SEXP pvids, SEXP porder,
   IGRAPH_R_CHECK(igraph_neighborhood_graphs(&g, &res, vids, order, mode, mindist));
   PROTECT(result=R_igraph_graphlist_to_SEXP(&res));
   IGRAPH_FREE(res.stor_begin);
-  igraph_vector_int_destroy_pv(&vids_data);
+  igraph_vector_int_destroy(&vids_data);
   igraph_vs_destroy(&vids);
 
   UNPROTECT(1);
@@ -6579,7 +6581,7 @@ SEXP R_igraph_coreness(SEXP graph, SEXP pmode) {
   IGRAPH_R_CHECK(igraph_coreness(&g, &res, mode));
 
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy_pv(&res);
+  igraph_vector_int_destroy(&res);
 
   UNPROTECT(1);
   return result;
@@ -6606,11 +6608,11 @@ SEXP R_igraph_maximal_cliques(SEXP graph, SEXP psubset,
   igraph_maximal_cliques_subset(&g, Rf_isNull(psubset) ? 0 : &subset,
                                 &list, /*no=*/ 0, /*file=*/ 0,
                                 minsize, maxsize);
-  igraph_vector_int_destroy_pv(&subset);
+  igraph_vector_int_destroy(&subset);
   IGRAPH_FINALLY_CLEAN(1);
 
   PROTECT(result=R_igraph_vector_int_list_to_SEXP(&list));
-  igraph_vector_int_list_destroy_pv(&list);
+  igraph_vector_int_list_destroy(&list);
 
   UNPROTECT(1);
   return result;
@@ -6647,7 +6649,7 @@ SEXP R_igraph_maximal_cliques_file(SEXP graph, SEXP psubset, SEXP file,
                                 /*ptr=*/ 0, /*no=*/ 0, /*file=*/ stream,
                                 minsize, maxsize);
   fclose(stream);
-  igraph_vector_int_destroy_pv(&subset);
+  igraph_vector_int_destroy(&subset);
   IGRAPH_FINALLY_CLEAN(1);
 #if HAVE_OPEN_MEMSTREAM == 1
   PROTECT(result=Rf_allocVector(RAWSXP, size));
@@ -6687,7 +6689,7 @@ SEXP R_igraph_maximal_cliques_count(SEXP graph, SEXP psubset,
                                 /*ptr=*/ 0, &c_no, /*file=*/ 0,
                                 c_min_size, c_max_size);
 
-  igraph_vector_int_destroy_pv(&subset);
+  igraph_vector_int_destroy(&subset);
   IGRAPH_FINALLY_CLEAN(1);
                                         /* Convert output */
   PROTECT(no=NEW_NUMERIC(1));
@@ -6710,7 +6712,7 @@ SEXP R_igraph_independent_vertex_sets(SEXP graph,
   igraph_vector_int_list_init(&list, 0);
   IGRAPH_R_CHECK(igraph_independent_vertex_sets(&g, &list, minsize, maxsize));
   PROTECT(result=R_igraph_vector_int_list_to_SEXP(&list));
-  igraph_vector_int_list_destroy_pv(&list);
+  igraph_vector_int_list_destroy(&list);
 
   UNPROTECT(1);
   return result;
@@ -6725,7 +6727,7 @@ SEXP R_igraph_largest_independent_vertex_sets(SEXP graph) {
   igraph_vector_int_list_init(&list,0);
   IGRAPH_R_CHECK(igraph_largest_independent_vertex_sets(&g, &list));
   PROTECT(result=R_igraph_vector_int_list_to_SEXP(&list));
-  igraph_vector_int_list_destroy_pv(&list);
+  igraph_vector_int_list_destroy(&list);
 
   UNPROTECT(1);
   return result;
@@ -6740,7 +6742,7 @@ SEXP R_igraph_maximal_independent_vertex_sets(SEXP graph) {
   igraph_vector_int_list_init(&list,0);
   IGRAPH_R_CHECK(igraph_maximal_independent_vertex_sets(&g, &list));
   PROTECT(result=R_igraph_vector_int_list_to_SEXP(&list));
-  igraph_vector_int_list_destroy_pv(&list);
+  igraph_vector_int_list_destroy(&list);
 
   UNPROTECT(1);
   return result;
@@ -6794,7 +6796,7 @@ SEXP R_igraph_cited_type_game(SEXP pnodes, SEXP pedges, SEXP ptypes,
   R_SEXP_to_vector(ppref, &pref);
   IGRAPH_R_CHECK(igraph_cited_type_game(&g, nodes, &types, &pref, edges, directed));
   PROTECT(result=R_igraph_to_SEXP(&g));
-  igraph_vector_int_destroy_pv(&types);
+  igraph_vector_int_destroy(&types);
   IGRAPH_I_DESTROY(&g);
 
   UNPROTECT(1);
@@ -6815,7 +6817,7 @@ SEXP R_igraph_citing_cited_type_game(SEXP pnodes, SEXP ptypes, SEXP ppref,
   R_SEXP_to_matrix(ppref, &pref);
   IGRAPH_R_CHECK(igraph_citing_cited_type_game(&g, nodes, &types, &pref, edges, directed));
   PROTECT(result=R_igraph_to_SEXP(&g));
-  igraph_vector_int_destroy_pv(&types);
+  igraph_vector_int_destroy(&types);
   IGRAPH_I_DESTROY(&g);
 
   UNPROTECT(1);
@@ -6857,13 +6859,13 @@ SEXP R_igraph_walktrap_community(SEXP graph, SEXP pweights,
   } else {
     SET_VECTOR_ELT(result, 1, R_NilValue);
   }
-  igraph_vector_destroy_pv(&modularity);
+  igraph_vector_destroy(&modularity);
   if (LOGICAL(pmembership)[0]) {
     SET_VECTOR_ELT(result, 2, R_igraph_0orvector_int_to_SEXP(&membership));
   } else {
     SET_VECTOR_ELT(result, 2, R_NilValue);
   }
-  igraph_vector_int_destroy_pv(&membership);
+  igraph_vector_int_destroy(&membership);
   PROTECT(names=NEW_CHARACTER(3));
   SET_STRING_ELT(names, 0, Rf_mkChar("merges"));
   SET_STRING_ELT(names, 1, Rf_mkChar("modularity"));
@@ -6885,7 +6887,7 @@ SEXP R_igraph_topological_sorting(SEXP graph, SEXP pmode) {
   IGRAPH_R_CHECK(igraph_topological_sorting(&g, &res, mode));
 
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy_pv(&res);
+  igraph_vector_int_destroy(&res);
 
   UNPROTECT(1);
   return result;
@@ -6936,17 +6938,17 @@ SEXP R_igraph_community_edge_betweenness(SEXP graph, SEXP pweights,
 
   PROTECT(result=NEW_LIST(6));
   SET_VECTOR_ELT(result, 0, R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy_pv(&res);
+  igraph_vector_int_destroy(&res);
   SET_VECTOR_ELT(result, 1, R_igraph_0orvector_to_SEXP(ppeb));
-  if (ppeb) { igraph_vector_destroy_pv(ppeb); }
+  if (ppeb) { igraph_vector_destroy(ppeb); }
   SET_VECTOR_ELT(result, 2, R_igraph_0ormatrix_int_to_SEXP(ppmerges));
   if (ppmerges) { igraph_matrix_int_destroy(ppmerges); }
   SET_VECTOR_ELT(result, 3, R_igraph_0orvector_int_to_SEXP(ppbridges));
-  if (ppbridges) { igraph_vector_int_destroy_pv(ppbridges); }
+  if (ppbridges) { igraph_vector_int_destroy(ppbridges); }
   SET_VECTOR_ELT(result, 4, R_igraph_0orvector_to_SEXP(ppmodularity));
-  if (ppmodularity) { igraph_vector_destroy_pv(ppmodularity); }
+  if (ppmodularity) { igraph_vector_destroy(ppmodularity); }
   SET_VECTOR_ELT(result, 5, R_igraph_0orvector_int_to_SEXP(ppmembership));
-  if (ppmembership) { igraph_vector_int_destroy_pv(ppmembership); }
+  if (ppmembership) { igraph_vector_int_destroy(ppmembership); }
   PROTECT(names=NEW_CHARACTER(6));
   SET_STRING_ELT(names, 0, Rf_mkChar("removed.edges"));
   SET_STRING_ELT(names, 1, Rf_mkChar("edge.betweenness"));
@@ -6992,9 +6994,9 @@ SEXP R_igraph_community_fastgreedy(SEXP graph, SEXP pmerges, SEXP pmodularity,
   SET_VECTOR_ELT(result, 0, R_igraph_0ormatrix_int_to_SEXP(ppmerges));
   if (ppmerges) { igraph_matrix_int_destroy(ppmerges); }
   SET_VECTOR_ELT(result, 1, R_igraph_0orvector_to_SEXP(ppmodularity));
-  if (ppmodularity) { igraph_vector_destroy_pv(ppmodularity); }
+  if (ppmodularity) { igraph_vector_destroy(ppmodularity); }
   SET_VECTOR_ELT(result, 2, R_igraph_0orvector_int_to_SEXP(ppmembership));
-  if (ppmembership) { igraph_vector_int_destroy_pv(ppmembership); }
+  if (ppmembership) { igraph_vector_int_destroy(ppmembership); }
   PROTECT(names=NEW_CHARACTER(3));
   SET_STRING_ELT(names, 0, Rf_mkChar("merges"));
   SET_STRING_ELT(names, 1, Rf_mkChar("modularity"));
@@ -7030,9 +7032,9 @@ SEXP R_igraph_community_to_membership(SEXP graph, SEXP pmerges,
   IGRAPH_R_CHECK(igraph_community_to_membership(&merges, nodes, steps, ppmembership, ppcsize));
   PROTECT(result=NEW_LIST(2));
   SET_VECTOR_ELT(result, 0, R_igraph_0orvector_int_to_SEXP(ppmembership));
-  if (ppmembership) { igraph_vector_int_destroy_pv(ppmembership); }
+  if (ppmembership) { igraph_vector_int_destroy(ppmembership); }
   SET_VECTOR_ELT(result, 1, R_igraph_0orvector_int_to_SEXP(ppcsize));
-  if (ppcsize) { igraph_vector_int_destroy_pv(ppcsize); }
+  if (ppcsize) { igraph_vector_int_destroy(ppcsize); }
   PROTECT(names=NEW_CHARACTER(2));
   SET_STRING_ELT(names, 0, Rf_mkChar("membership"));
   SET_STRING_ELT(names, 1, Rf_mkChar("csize"));
@@ -7061,7 +7063,7 @@ SEXP R_igraph_community_to_membership2(SEXP pmerges, SEXP pvcount,
   PROTECT(result=R_igraph_vector_int_to_SEXP(&membership));
 
   igraph_matrix_int_destroy(&merges);
-  igraph_vector_int_destroy_pv(&membership);
+  igraph_vector_int_destroy(&membership);
   IGRAPH_FINALLY_CLEAN(2);
 
   UNPROTECT(1);
@@ -7084,7 +7086,7 @@ SEXP R_igraph_girth(SEXP graph, SEXP pcircle) {
   SET_VECTOR_ELT(result, 0, NEW_NUMERIC(1));
   REAL(VECTOR_ELT(result, 0))[0]=girth;
   SET_VECTOR_ELT(result, 1, R_igraph_0orvector_int_to_SEXPp1(ppcircle));
-  if (ppcircle) { igraph_vector_int_destroy_pv(ppcircle); }
+  if (ppcircle) { igraph_vector_int_destroy(ppcircle); }
   PROTECT(names=NEW_CHARACTER(2));
   SET_STRING_ELT(names, 0, Rf_mkChar("girth"));
   SET_STRING_ELT(names, 1, Rf_mkChar("circle"));
@@ -7125,7 +7127,7 @@ SEXP R_igraph_get_adjlist(SEXP graph, SEXP pmode, SEXP ploops, SEXP pmultiple) {
     igraph_i_neighbors(&g, &neis, i, mode, (igraph_loops_t) loops, (igraph_multiple_t) multiple);
     SET_VECTOR_ELT(result, i, R_igraph_vector_int_to_SEXP(&neis));
   }
-  igraph_vector_int_destroy_pv(&neis);
+  igraph_vector_int_destroy(&neis);
 
   UNPROTECT(1);
   return result;
@@ -7148,7 +7150,7 @@ SEXP R_igraph_get_adjedgelist(SEXP graph, SEXP pmode, SEXP ploops) {
     igraph_i_incident(&g, &neis, (igraph_integer_t) i, mode, (igraph_loops_t) loops);
     SET_VECTOR_ELT(result, i, R_igraph_vector_int_to_SEXP(&neis));
   }
-  igraph_vector_int_destroy_pv(&neis);
+  igraph_vector_int_destroy(&neis);
 
   UNPROTECT(1);
   return result;
@@ -7222,13 +7224,13 @@ SEXP R_igraph_arpack(SEXP function, SEXP extra, SEXP options, SEXP rho,
   PROTECT(result=NEW_LIST(3));
   if (LOGICAL(sym)[0]) {
     SET_VECTOR_ELT(result, 0, R_igraph_vector_to_SEXP(&values));
-    igraph_vector_destroy_pv(&values); IGRAPH_FINALLY_CLEAN(1);
+    igraph_vector_destroy(&values); IGRAPH_FINALLY_CLEAN(1);
   } else {
     SET_VECTOR_ELT(result, 0, R_igraph_matrix_to_SEXP(&values2));
-    igraph_matrix_destroy_pv(&values2); IGRAPH_FINALLY_CLEAN(1);
+    igraph_matrix_destroy(&values2); IGRAPH_FINALLY_CLEAN(1);
   }
   SET_VECTOR_ELT(result, 1, R_igraph_matrix_to_SEXP(&vectors));
-  igraph_matrix_destroy_pv(&vectors); IGRAPH_FINALLY_CLEAN(1);
+  igraph_matrix_destroy(&vectors); IGRAPH_FINALLY_CLEAN(1);
   SET_VECTOR_ELT(result, 2, R_igraph_arpack_options_to_SEXP(&c_options));
   PROTECT(names=NEW_CHARACTER(3));
   SET_STRING_ELT(names, 0, Rf_mkChar("values"));
@@ -7272,7 +7274,7 @@ SEXP R_igraph_is_chordal(SEXP graph, SEXP alpha, SEXP alpham1,
   LOGICAL(chordal)[0]=c_chordal;
   if (LOGICAL(pfillin)[0]) {
     PROTECT(fillin=R_igraph_vector_int_to_SEXP(&c_fillin));
-    igraph_vector_int_destroy_pv(&c_fillin);
+    igraph_vector_int_destroy(&c_fillin);
     IGRAPH_FINALLY_CLEAN(1);
   } else {
     PROTECT(fillin=R_NilValue);
@@ -7442,17 +7444,17 @@ SEXP R_igraph_bfs(SEXP graph, SEXP proot, SEXP proots, SEXP pmode,
 
   UNPROTECT(2);
 
-  igraph_vector_int_destroy_pv(&roots);
+  igraph_vector_int_destroy(&roots);
   IGRAPH_FINALLY_CLEAN(1);
-  igraph_vector_int_destroy_pv(&restricted);
+  igraph_vector_int_destroy(&restricted);
   IGRAPH_FINALLY_CLEAN(1);
 
-  if (p_dist) { igraph_vector_int_destroy_pv(p_dist); IGRAPH_FINALLY_CLEAN(1); p_dist = 0; }
-  if (p_succ) { igraph_vector_int_destroy_pv(p_succ); IGRAPH_FINALLY_CLEAN(1); p_succ = 0; }
-  if (p_pred) { igraph_vector_int_destroy_pv(p_pred); IGRAPH_FINALLY_CLEAN(1); p_pred = 0; }
-  if (p_father) { igraph_vector_int_destroy_pv(p_father); IGRAPH_FINALLY_CLEAN(1); p_father = 0; }
-  if (p_rank) { igraph_vector_int_destroy_pv(p_rank); IGRAPH_FINALLY_CLEAN(1); p_rank = 0; }
-  if (p_order) { igraph_vector_int_destroy_pv(p_order); IGRAPH_FINALLY_CLEAN(1); p_order = 0; }
+  if (p_dist) { igraph_vector_int_destroy(p_dist); IGRAPH_FINALLY_CLEAN(1); p_dist = 0; }
+  if (p_succ) { igraph_vector_int_destroy(p_succ); IGRAPH_FINALLY_CLEAN(1); p_succ = 0; }
+  if (p_pred) { igraph_vector_int_destroy(p_pred); IGRAPH_FINALLY_CLEAN(1); p_pred = 0; }
+  if (p_father) { igraph_vector_int_destroy(p_father); IGRAPH_FINALLY_CLEAN(1); p_father = 0; }
+  if (p_rank) { igraph_vector_int_destroy(p_rank); IGRAPH_FINALLY_CLEAN(1); p_rank = 0; }
+  if (p_order) { igraph_vector_int_destroy(p_order); IGRAPH_FINALLY_CLEAN(1); p_order = 0; }
 
   return result;
 }
@@ -7617,13 +7619,13 @@ SEXP R_igraph_cohesive_blocks(SEXP graph) {
   PROTECT(result=NEW_LIST(4));
   PROTECT(names=NEW_CHARACTER(4));
   PROTECT(blocks=R_igraph_vector_int_list_to_SEXPp1(&c_blocks));
-  igraph_vector_int_list_destroy_pv(&c_blocks);
+  igraph_vector_int_list_destroy(&c_blocks);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(cohesion=R_igraph_vector_int_to_SEXP(&c_cohesion));
-  igraph_vector_int_destroy_pv(&c_cohesion);
+  igraph_vector_int_destroy(&c_cohesion);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(parent=R_igraph_vector_int_to_SEXPp1(&c_parent));
-  igraph_vector_int_destroy_pv(&c_parent);
+  igraph_vector_int_destroy(&c_parent);
   IGRAPH_FINALLY_CLEAN(1);
   IGRAPH_FINALLY_PV(igraph_destroy, &c_blockTree);
   PROTECT(blockTree=R_igraph_to_SEXP(&c_blockTree));
@@ -7771,17 +7773,17 @@ SEXP R_igraph_community_leading_eigenvector(SEXP graph, SEXP steps,
   igraph_matrix_int_destroy(&c_merges);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(membership=R_igraph_vector_int_to_SEXP(&c_membership));
-  igraph_vector_int_destroy_pv(&c_membership);
+  igraph_vector_int_destroy(&c_membership);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(options=R_igraph_arpack_options_to_SEXP(&c_options));
   PROTECT(modularity=NEW_NUMERIC(1));
   REAL(modularity)[0]=c_modularity;
   PROTECT(eigenvalues=R_igraph_vector_to_SEXP(&c_eigenvalues));
-  igraph_vector_destroy_pv(&c_eigenvalues);
+  igraph_vector_destroy(&c_eigenvalues);
   PROTECT(eigenvectors=R_igraph_vector_list_to_SEXP(&c_eigenvectors));
   igraph_vector_list_destroy(&c_eigenvectors);
   PROTECT(history=R_igraph_vector_to_SEXP(&c_history));
-  igraph_vector_destroy_pv(&c_history);
+  igraph_vector_destroy(&c_history);
   SET_VECTOR_ELT(result, 0, merges);
   SET_VECTOR_ELT(result, 1, membership);
   SET_VECTOR_ELT(result, 2, options);
@@ -7820,8 +7822,8 @@ SEXP R_igraph_get_eids(SEXP graph, SEXP pvp, SEXP pdirected,
   IGRAPH_R_CHECK(igraph_get_eids(&g, &res, /*pairs=*/ &vp, directed, err));
 
   PROTECT(result=R_igraph_vector_int_to_SEXP(&res));
-  igraph_vector_int_destroy_pv(&vp);
-  igraph_vector_int_destroy_pv(&res);
+  igraph_vector_int_destroy(&vp);
+  igraph_vector_int_destroy(&res);
 
   UNPROTECT(1);
   return result;
@@ -7885,7 +7887,7 @@ SEXP R_igraph_subisomorphic_lad(SEXP pattern, SEXP target, SEXP domains,
   IGRAPH_R_CHECK(igraph_subisomorphic_lad(&c_pattern, &c_target, (Rf_isNull(domains) ? 0 : &c_domains), &c_iso, (Rf_isNull(map) ? 0 : &c_map), (Rf_isNull(maps) ? 0 : &c_maps), c_induced, c_time_limit));
 
                                         /* Convert output */
-  igraph_vector_int_list_destroy_pv(&c_domains);
+  igraph_vector_int_list_destroy(&c_domains);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(result=NEW_LIST(3));
   PROTECT(names=NEW_CHARACTER(3));
@@ -7893,14 +7895,14 @@ SEXP R_igraph_subisomorphic_lad(SEXP pattern, SEXP target, SEXP domains,
   LOGICAL(iso)[0]=c_iso;
   if (!Rf_isNull(map)) {
     PROTECT(map=R_igraph_0orvector_int_to_SEXP(&c_map));
-    igraph_vector_int_destroy_pv(&c_map);
+    igraph_vector_int_destroy(&c_map);
     IGRAPH_FINALLY_CLEAN(1);
   } else {
     PROTECT(map=R_NilValue);
   }
   if (!Rf_isNull(maps)) {
     PROTECT(maps=R_igraph_0orvector_int_list_to_SEXP(&c_maps));
-    igraph_vector_int_list_destroy_pv(&c_maps);
+    igraph_vector_int_list_destroy(&c_maps);
     IGRAPH_FINALLY_CLEAN(1);
   } else {
     PROTECT(maps=R_NilValue);
@@ -7951,10 +7953,10 @@ SEXP R_igraph_graphlets(SEXP graph, SEXP weights, SEXP niter) {
   PROTECT(result=NEW_LIST(2));
   PROTECT(names=NEW_CHARACTER(2));
   PROTECT(cliques=R_igraph_vector_int_list_to_SEXPp1(&c_cliques));
-  igraph_vector_int_list_destroy_pv(&c_cliques);
+  igraph_vector_int_list_destroy(&c_cliques);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(Mu=R_igraph_vector_to_SEXP(&c_Mu));
-  igraph_vector_destroy_pv(&c_Mu);
+  igraph_vector_destroy(&c_Mu);
   IGRAPH_FINALLY_CLEAN(1);
   SET_VECTOR_ELT(result, 0, cliques);
   SET_VECTOR_ELT(result, 1, Mu);
@@ -7999,10 +8001,10 @@ SEXP R_igraph_graphlets_candidate_basis(SEXP graph, SEXP weights) {
   PROTECT(result=NEW_LIST(2));
   PROTECT(names=NEW_CHARACTER(2));
   PROTECT(cliques=R_igraph_vector_int_list_to_SEXPp1(&c_cliques));
-  igraph_vector_int_list_destroy_pv(&c_cliques);
+  igraph_vector_int_list_destroy(&c_cliques);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(thresholds=R_igraph_vector_to_SEXP(&c_thresholds));
-  igraph_vector_destroy_pv(&c_thresholds);
+  igraph_vector_destroy(&c_thresholds);
   IGRAPH_FINALLY_CLEAN(1);
   SET_VECTOR_ELT(result, 0, cliques);
   SET_VECTOR_ELT(result, 1, thresholds);
@@ -8060,9 +8062,9 @@ SEXP R_igraph_graphlets_project(SEXP graph, SEXP weights, SEXP cliques,
 
   /* Convert output */
   PROTECT(Mu=R_igraph_vector_to_SEXP(&c_Mu));
-  igraph_vector_int_list_destroy_pv(&c_cliques);
+  igraph_vector_int_list_destroy(&c_cliques);
   IGRAPH_FINALLY_CLEAN(1);
-  igraph_vector_destroy_pv(&c_Mu);
+  igraph_vector_destroy(&c_Mu);
   IGRAPH_FINALLY_CLEAN(1);
   result=Mu;
 
@@ -8126,17 +8128,17 @@ SEXP R_igraph_adjacency_spectral_embedding(SEXP graph, SEXP no,
   PROTECT(result=NEW_LIST(4));
   PROTECT(names=NEW_CHARACTER(4));
   PROTECT(X=R_igraph_matrix_to_SEXP(&c_X));
-  igraph_matrix_destroy_pv(&c_X);
+  igraph_matrix_destroy(&c_X);
   IGRAPH_FINALLY_CLEAN(1);
   if (directed) {
     PROTECT(Y=R_igraph_matrix_to_SEXP(&c_Y));
-    igraph_matrix_destroy_pv(&c_Y);
+    igraph_matrix_destroy(&c_Y);
     IGRAPH_FINALLY_CLEAN(1);
   } else {
     PROTECT(Y=R_NilValue);
   }
   PROTECT(D=R_igraph_vector_to_SEXP(&c_D));
-  igraph_vector_destroy_pv(&c_D);
+  igraph_vector_destroy(&c_D);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(options=R_igraph_arpack_options_to_SEXP(&c_options));
   SET_VECTOR_ELT(result, 0, X);
@@ -8205,17 +8207,17 @@ SEXP R_igraph_laplacian_spectral_embedding(SEXP graph, SEXP no,
   PROTECT(result=NEW_LIST(4));
   PROTECT(names=NEW_CHARACTER(4));
   PROTECT(X=R_igraph_matrix_to_SEXP(&c_X));
-  igraph_matrix_destroy_pv(&c_X);
+  igraph_matrix_destroy(&c_X);
   IGRAPH_FINALLY_CLEAN(1);
   if (directed) {
     PROTECT(Y=R_igraph_matrix_to_SEXP(&c_Y));
-    igraph_matrix_destroy_pv(&c_Y);
+    igraph_matrix_destroy(&c_Y);
     IGRAPH_FINALLY_CLEAN(1);
   } else {
     PROTECT(Y=R_NilValue);
   }
   PROTECT(D=R_igraph_0orvector_to_SEXP(&c_D));
-  igraph_vector_destroy_pv(&c_D);
+  igraph_vector_destroy(&c_D);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(options=R_igraph_arpack_options_to_SEXP(&c_options));
   SET_VECTOR_ELT(result, 0, X);
@@ -8289,10 +8291,10 @@ SEXP R_igraph_bipartite_projection(SEXP graph, SEXP types, SEXP probe1,
     PROTECT(proj2=R_NilValue);
   }
   PROTECT(multiplicity1=R_igraph_0orvector_int_to_SEXP(&c_multiplicity1));
-  igraph_vector_int_destroy_pv(&c_multiplicity1);
+  igraph_vector_int_destroy(&c_multiplicity1);
   IGRAPH_FINALLY_CLEAN(1);
   PROTECT(multiplicity2=R_igraph_0orvector_int_to_SEXP(&c_multiplicity2));
-  igraph_vector_int_destroy_pv(&c_multiplicity2);
+  igraph_vector_int_destroy(&c_multiplicity2);
   IGRAPH_FINALLY_CLEAN(1);
   SET_VECTOR_ELT(result, 0, proj1);
   SET_VECTOR_ELT(result, 1, proj2);
@@ -8348,7 +8350,7 @@ SEXP R_igraph_adjacent_vertices(SEXP pgraph, SEXP pv, SEXP pmode) {
   igraph_lazy_adjlist_destroy(&adjlist);
   igraph_vit_destroy(&vit);
   igraph_vs_destroy(&vs);
-  igraph_vector_int_destroy_pv(&vs_data);
+  igraph_vector_int_destroy(&vs_data);
   IGRAPH_FINALLY_CLEAN(4);
 
   UNPROTECT(1);
@@ -8390,7 +8392,7 @@ SEXP R_igraph_incident_edges(SEXP pgraph, SEXP pe, SEXP pmode) {
   igraph_lazy_inclist_destroy(&adjlist);
   igraph_vit_destroy(&vit);
   igraph_vs_destroy(&vs);
-  igraph_vector_int_destroy_pv(&vs_data);
+  igraph_vector_int_destroy(&vs_data);
   IGRAPH_FINALLY_CLEAN(4);
 
   UNPROTECT(1);