From c96923732141bf3823f1b5acb666c407f07fa9c2 Mon Sep 17 00:00:00 2001
From: simonjub <78098752+simonjub@users.noreply.github.com>
Date: Sun, 17 Sep 2023 15:19:32 -0400
Subject: [PATCH] [TRT EP] Fix ProviderOptions functions (#17567)

### Description
When trying to use the TRT EP option trt_extra_plugin_lib_paths I
noticed that my custom op library was not being loaded by the EP. After
some digging I found that code was missing to update this option when
UpdateTensorRTProviderOptions() is used to set it.

At the same time I noticed that char arrays were allocated in that
function and wondered where they are de-allocated. When I found it was
done in ReleaseTensorRTProviderOptions(), I noticed that a few
de-allocations were missing.

### Motivation and Context
This PR fixes the problems described above.
---
 .../tensorrt/tensorrt_provider_factory.cc          | 14 ++++++++++++++
 onnxruntime/core/session/provider_bridge_ort.cc    | 11 ++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/onnxruntime/core/providers/tensorrt/tensorrt_provider_factory.cc b/onnxruntime/core/providers/tensorrt/tensorrt_provider_factory.cc
index 90aeeb64c9d24..18ec113734b97 100644
--- a/onnxruntime/core/providers/tensorrt/tensorrt_provider_factory.cc
+++ b/onnxruntime/core/providers/tensorrt/tensorrt_provider_factory.cc
@@ -202,6 +202,20 @@ struct Tensorrt_Provider : Provider {
       trt_options.trt_tactic_sources = (const char*)dest;
     }
 
+    str_size = internal_options.extra_plugin_lib_paths.size();
+    if (str_size == 0) {
+      trt_options.trt_extra_plugin_lib_paths = nullptr;
+    } else {
+      dest = new char[str_size + 1];
+#ifdef _MSC_VER
+      strncpy_s(dest, str_size + 1, internal_options.extra_plugin_lib_paths.c_str(), str_size);
+#else
+      strncpy(dest, internal_options.extra_plugin_lib_paths.c_str(), str_size);
+#endif
+      dest[str_size] = '\0';
+      trt_options.trt_extra_plugin_lib_paths = (const char*)dest;
+    }
+
     str_size = internal_options.profile_min_shapes.size();
     if (str_size == 0) {
       trt_options.trt_profile_min_shapes = nullptr;
diff --git a/onnxruntime/core/session/provider_bridge_ort.cc b/onnxruntime/core/session/provider_bridge_ort.cc
index 8f0a5aeaa3975..bf7a3bbd9d380 100644
--- a/onnxruntime/core/session/provider_bridge_ort.cc
+++ b/onnxruntime/core/session/provider_bridge_ort.cc
@@ -1930,9 +1930,14 @@ ORT_API_STATUS_IMPL(OrtApis::GetTensorRTProviderOptionsByName,
 ORT_API(void, OrtApis::ReleaseTensorRTProviderOptions, _Frees_ptr_opt_ OrtTensorRTProviderOptionsV2* ptr) {
 #ifdef USE_TENSORRT
   if (ptr != nullptr) {
-    delete ptr->trt_int8_calibration_table_name;
-    delete ptr->trt_engine_cache_path;
-    delete ptr->trt_engine_decryption_lib_path;
+    delete[] ptr->trt_int8_calibration_table_name;
+    delete[] ptr->trt_engine_cache_path;
+    delete[] ptr->trt_engine_decryption_lib_path;
+    delete[] ptr->trt_tactic_sources;
+    delete[] ptr->trt_extra_plugin_lib_paths;
+    delete[] ptr->trt_profile_min_shapes;
+    delete[] ptr->trt_profile_max_shapes;
+    delete[] ptr->trt_profile_opt_shapes;
   }
 
   std::unique_ptr<OrtTensorRTProviderOptionsV2> p(ptr);