From 4ef476734c74cca0818c9876d085e9206403d6c6 Mon Sep 17 00:00:00 2001
From: Georgy Moshkin <gmoshkin@picodata.io>
Date: Mon, 23 Sep 2024 18:33:30 +0300
Subject: [PATCH] fix: used to drop the closure after first call to plugin RPC
handler
---
picoplugin/src/transport/rpc/server.rs | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/picoplugin/src/transport/rpc/server.rs b/picoplugin/src/transport/rpc/server.rs
index ca6c8533bf..ee2cc450fa 100644
--- a/picoplugin/src/transport/rpc/server.rs
+++ b/picoplugin/src/transport/rpc/server.rs
@@ -254,7 +254,7 @@ impl FfiRpcHandler {
{
// This is safe. To verify see `register_rpc_handler` above.
let closure_pointer: *mut F = unsafe { (*handler).closure_pointer.cast::<F>() };
- let mut closure = unsafe { Box::from_raw(closure_pointer) };
+ let closure = unsafe { &*closure_pointer };
let input = unsafe { input.as_bytes() };
let context = unsafe { &*context };
let mut context = Context::new(context);
@@ -285,6 +285,11 @@ impl FfiRpcHandler {
let closure = Box::from_raw(closure_pointer);
drop(closure);
+ if cfg!(debug_assertions) {
+ // Overwrite the pointer with garbage so that we fail loudly is case of a bug
+ (*handler).closure_pointer = 0xcccccccccccccccc_u64 as _;
+ }
+
let (pointer, capacity) = (*handler).string_storage.into_raw_parts();
// Note: we pretend the original Vec was filled to capacity which
// may or may not be true, there might have been some unitialized
--
GitLab