From b2b2173b5c28b0d6b012b9369cedba37751d6a4b Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Wed, 9 Jun 2021 06:46:18 -0700
Subject: ffi: leak fix on !HAVE_FFI builds.

The ffi_type_struct_destroy_op only frees
tft->ft if HAVE_FFI is true. But the object is allocated in
several places without regard for HAVE_FFI.

* ffi.c (ffi_struct_clone, make_ffi_type_struct,
make_ffi_type_union, ffi_array_clone, make_ffi_type_array): Do
not allocate a ffi_type object if HAVE_FFI is false.
---
 ffi.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'ffi.c')

diff --git a/ffi.c b/ffi.c
index 9a104547..4c457584 100644
--- a/ffi.c
+++ b/ffi.c
@@ -3181,11 +3181,13 @@ static struct txr_ffi_type *ffi_struct_clone(struct txr_ffi_type *orig)
   cnum nmemb = orig->nelem;
   struct txr_ffi_type *copy = ffi_simple_clone(orig);
   size_t memb_size = sizeof *orig->memb * nmemb;
+#if HAVE_LIBFFI
   ffi_type *ft = coerce(ffi_type *, chk_copy_obj(coerce(mem_t *, orig->ft),
                                                  sizeof *orig->ft));
+#endif
 
-  copy->ft = ft;
 #if HAVE_LIBFFI
+  copy->ft = ft;
   ft->elements = copy->elements;
 #endif
   copy->memb = coerce(struct smemb *, chk_copy_obj(coerce(mem_t *,
@@ -3225,9 +3227,11 @@ static val make_ffi_type_struct(val syntax, val lisp_type,
                                  ffi_type_struct(use_existing),
                                  coerce(struct txr_ffi_type *,
                                         chk_calloc(1, sizeof *tft)));
+#if HAVE_LIBFFI
   ffi_type *ft = if3(use_existing,
                      tft->ft,
                      coerce(ffi_type *, chk_calloc(1, sizeof *ft)));
+#endif
   int flexp = 0;
   val slot_exprs = cddr(syntax);
   cnum nmemb = c_num(length(slot_exprs), self), i;
@@ -3253,7 +3257,9 @@ static val make_ffi_type_struct(val syntax, val lisp_type,
 
   tft->self = obj;
   tft->kind = FFI_KIND_STRUCT;
+#if HAVE_LIBFFI
   tft->ft = ft;
+#endif
   tft->syntax = syntax;
   tft->lt = lisp_type;
   tft->clone = ffi_struct_clone;
@@ -3396,9 +3402,11 @@ static val make_ffi_type_union(val syntax, val use_existing, val self)
                                  ffi_type_struct(use_existing),
                                  coerce(struct txr_ffi_type *,
                                         chk_calloc(1, sizeof *tft)));
+#if HAVE_LIBFFI
   ffi_type *ft = if3(use_existing,
                      tft->ft,
                      coerce(ffi_type *, chk_calloc(1, sizeof *ft)));
+#endif
   int flexp = 0;
   val slot_exprs = cddr(syntax);
   cnum nmemb = c_num(length(slot_exprs), self), i;
@@ -3422,7 +3430,9 @@ static val make_ffi_type_union(val syntax, val use_existing, val self)
 
   tft->self = obj;
   tft->kind = FFI_KIND_UNION;
+#if HAVE_LIBFI
   tft->ft = ft;
+#endif
   tft->syntax = syntax;
   tft->lt = union_s;
   tft->nelem = nmemb;
@@ -3516,11 +3526,13 @@ static val make_ffi_type_union(val syntax, val use_existing, val self)
 static struct txr_ffi_type *ffi_array_clone(struct txr_ffi_type *orig)
 {
   struct txr_ffi_type *copy = ffi_simple_clone(orig);
+#if HAVE_LIBFFI
   ffi_type *ft = coerce(ffi_type *, chk_copy_obj(coerce(mem_t *, orig->ft),
                                                  sizeof *orig->ft));
+#endif
 
-  copy->ft = ft;
 #if HAVE_LIBFFI
+  copy->ft = ft;
   ft->elements = copy->elements;
 #endif
   return copy;
@@ -3531,7 +3543,9 @@ static val make_ffi_type_array(val syntax, val lisp_type,
 {
   struct txr_ffi_type *tft = coerce(struct txr_ffi_type *,
                                     chk_calloc(1, sizeof *tft));
+#if HAVE_LIBFFI
   ffi_type *ft = coerce(ffi_type *, chk_calloc(1, sizeof *ft));
+#endif
   cnum nelem = c_num(dim, self);
   val obj = cobj(coerce(mem_t *, tft), ffi_type_s, &ffi_type_struct_ops);
 
@@ -3541,7 +3555,9 @@ static val make_ffi_type_array(val syntax, val lisp_type,
 
   tft->self = obj;
   tft->kind = FFI_KIND_ARRAY;
+#if HAVE_LIBFFI
   tft->ft = ft;
+#endif
   tft->syntax = syntax;
   tft->lt = lisp_type;
   tft->eltype = eltype;
-- 
cgit v1.2.3