X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Flibffi.c;h=ee077af19b4b2af2cbba62b6c41dc2961355eaa8;hp=bb1f34f7cd536ed9d72acb5afce08144191f3569;hb=3137da963d298c73ce3bc858874fdfc87fa941b7;hpb=7a717dad32d06fe5273ad3a9ce755908723f6685

diff --git a/src/libffi.c b/src/libffi.c
index bb1f34f..ee077af 100644
--- a/src/libffi.c
+++ b/src/libffi.c
@@ -152,7 +152,7 @@ static inline void PSI_LibffiCallInitClosure(PSI_Context *C, PSI_LibffiCall *cal
 			call->code);
 
 #elif PSI_HAVE_FFI_PREP_CLOSURE
-	rc = ffi_prep_closure(data->code, &context->signature, psi_ffi_handler, data);
+	rc = ffi_prep_closure(call->code, &context->signature, psi_ffi_handler, impl);
 #else
 # error "Neither ffi_prep_closure() nor ffi_prep_closure_loc() available"
 #endif
@@ -192,14 +192,17 @@ static void psi_ffi_init(PSI_Context *C)
 	C->context = PSI_LibffiContextInit(NULL);
 }
 
-static void psi_ffi_dtor(PSI_Context *C) {
-	size_t i;
+static void psi_ffi_dtor(PSI_Context *C)
+{
+	if (C->decls) {
+		size_t i;
 
-	for (i = 0; i < C->decls->count; ++i) {
-		decl *decl = C->decls->list[i];
+		for (i = 0; i < C->decls->count; ++i) {
+			decl *decl = C->decls->list[i];
 
-		if (decl->call.info) {
-			PSI_LibffiCallFree(decl->call.info);
+			if (decl->call.info) {
+				PSI_LibffiCallFree(decl->call.info);
+			}
 		}
 	}
 	free(C->context);