From 346c7149dd81bc94b05d75bc8821af200a2abd62 Mon Sep 17 00:00:00 2001 From: "Baraldi, Giovanni" Date: Thu, 13 Mar 2025 17:25:16 +0100 Subject: [PATCH] SWDEV-518826: Adding nullptr check after gpu name query (#257) * Fix segfault on fail to query GPU name * Format * Review comments * Format * Review comment --------- Co-authored-by: Giovanni Baraldi --- source/lib/rocprofiler-sdk/agent.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/source/lib/rocprofiler-sdk/agent.cpp b/source/lib/rocprofiler-sdk/agent.cpp index 619be01b1c..a0ec6827fa 100644 --- a/source/lib/rocprofiler-sdk/agent.cpp +++ b/source/lib/rocprofiler-sdk/agent.cpp @@ -708,9 +708,12 @@ read_topology() agent_info.name = common::get_string_entry(fmt::format("gfx{}{}{:x}", major, minor, step)) ->c_str(); - agent_info.product_name = - common::get_string_entry(amdgpu_get_marketing_name(device_handle))->c_str(); - agent_info.vendor_name = common::get_string_entry("AMD")->c_str(); + + const char* marketing_name = amdgpu_get_marketing_name(device_handle); + if(marketing_name == nullptr) marketing_name = "unknown"; + + agent_info.product_name = common::get_string_entry(marketing_name)->c_str(); + agent_info.vendor_name = common::get_string_entry("AMD")->c_str(); amdgpu_gpu_info gpu_info = {}; if(amdgpu_query_gpu_info(device_handle, &gpu_info) == 0)