Allow null Vec<PluginMetadata> pointer

Ortham · Jun 23, 2024 · 37babed · 37babed
1 parent 3e760a5
commit 37babed
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/ffi/src/plugin.rs b/ffi/src/plugin.rs
@@ -117,11 +117,15 @@ pub unsafe extern "C" fn esp_plugin_resolve_record_ids(
     plugins_metadata: *mut Vec<PluginMetadata>,
 ) -> u32 {
     panic::catch_unwind(|| {
-        if plugin_ptr.is_null() || plugins_metadata.is_null() {
+        if plugin_ptr.is_null() {
             error(ESP_ERROR_NULL_POINTER, "Null pointer passed")
         } else {
             let plugin = &mut *plugin_ptr;
-            let plugins_metadata = &*plugins_metadata;
+            let plugins_metadata = if plugins_metadata.is_null() {
+                &[]
+            } else {
+                (&*plugins_metadata).as_slice()
+            };
 
             match plugin.resolve_record_ids(plugins_metadata) {
                 Ok(_) => ESP_OK,

diff --git a/ffi/tests/ffi.cpp b/ffi/tests/ffi.cpp
@@ -64,6 +64,9 @@ void test_esp_plugin_resolve_record_ids() {
   return_code = esp_plugin_parse(plugin, true);
   assert(return_code == ESP_OK);
 
+  esp_plugin_resolve_record_ids(plugin, nullptr);
+  assert(return_code == ESP_OK);
+
   Vec_PluginMetadata * plugins_metadata;
   return_code = esp_get_plugins_metadata(&plugin, 1, &plugins_metadata);
   assert(return_code == ESP_OK);