address code review comments: use references, plus add extra nullptr check, and add braces around if/else with a macro

Author: intbf

onnxruntime/core/providers/openvino/backend_manager.cc

@@ -348,12 +348,12 @@ static void DumpOpenVINOEPModel([[maybe_unused]] const std::filesystem::path& on
 
 // this is a helper function to set the data fields, it duplicates ExternalDataInfo::SetExternalLocationToProto
 // but we cannot use that function as it is not part of public provider api.
-static void SetExternalDataFields(ONNX_NAMESPACE::TensorProto* proto_init, const void* data_ptr, int64_t data_size) {
+static void SetExternalDataFields(ONNX_NAMESPACE::TensorProto& proto_init, const void* data_ptr, int64_t data_size) {
   static constexpr const char* ORT_INTERNAL_MEM_INITIALIZER = "*/_ORT_MEM_ADDR_/*";
-  auto* external_data = proto_init->mutable_external_data();
+  auto* external_data = proto_init.mutable_external_data();
   bool found_location = false, found_offset = false, found_length = false;
   const int ext_data_size = external_data->size();
-  proto_init->set_data_location(ONNX_NAMESPACE::TensorProto_DataLocation::TensorProto_DataLocation_EXTERNAL);
+  proto_init.set_data_location(ONNX_NAMESPACE::TensorProto_DataLocation::TensorProto_DataLocation_EXTERNAL);
 
   for (int j = 0; j < ext_data_size; ++j) {
     auto& ext_entry = external_data->at(j);
@@ -543,6 +543,10 @@ BackendManager::GetModelProtoFromFusedNode(const onnxruntime::Node& fused_node,
 
         auto* proto_init = it->second;
 
+        if (!proto_init) {
+            ORT_THROW(name + " proto initializer is null!");
+        }
+
         // If the proto initializer is missing data, fill it in
         if (!proto_init->has_raw_data() && src_init->has_raw_data()) {
           *proto_init->mutable_raw_data() = src_init->raw_data();
@@ -554,10 +558,12 @@ BackendManager::GetModelProtoFromFusedNode(const onnxruntime::Node& fused_node,
                                 << src_init->name()
                                 << ", data_type: " << src_init->data_type()
                                 << ", raw_data size: " << src_init->raw_data().size();
-          if (src_init->raw_data().size() > 0)
-            SetExternalDataFields(proto_init, src_init->raw_data().data(), src_init->raw_data().size());
-          else
-            LOGS(logger, VERBOSE) << "Initializer has empty raw_data: skipping initializer '" << src_init->name() << "'...";
+          if (src_init->raw_data().size() > 0) {
+              SetExternalDataFields(*proto_init, src_init->raw_data().data(), src_init->raw_data().size());
+          }
+          else {
+              LOGS(logger, VERBOSE) << "Initializer has empty raw_data: skipping initializer '" << src_init->name() << "'...";
+          }
         } else if (onnxruntime::utils::HasExternalDataInMemory(*src_init)) {
           auto it_ext = external_initializers_offset_and_length.find(name);
           if (it_ext == external_initializers_offset_and_length.end()) {
@@ -570,7 +576,7 @@ BackendManager::GetModelProtoFromFusedNode(const onnxruntime::Node& fused_node,
 
           LOGS(logger, VERBOSE) << "In-memory initializer EXT: " << src_init->name() << ", size: " << length;
 
-          SetExternalDataFields(proto_init, (const void*)offset, length);
+          SetExternalDataFields(*proto_init, (const void*)offset, length);
         } else {
           LOGS(logger, VERBOSE) << "File-based initializer: " << src_init->name() << ", data_type: " << src_init->data_type();
         }