From e38a44f0614925c8cc0830a156495479ead412a8 Mon Sep 17 00:00:00 2001
From: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
Date: Mon, 25 Oct 2021 18:18:12 -0700
Subject: [PATCH] [profiler_capture_api] minor memory usage rework pointed out
 in PR feedback

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
---
 Gems/Profiler/Code/Source/ImGuiCpuProfiler.cpp | 9 ++++-----
 Gems/Profiler/Code/Source/ImGuiCpuProfiler.h   | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Gems/Profiler/Code/Source/ImGuiCpuProfiler.cpp b/Gems/Profiler/Code/Source/ImGuiCpuProfiler.cpp
index 52fe09f9e8..88b200c733 100644
--- a/Gems/Profiler/Code/Source/ImGuiCpuProfiler.cpp
+++ b/Gems/Profiler/Code/Source/ImGuiCpuProfiler.cpp
@@ -418,13 +418,12 @@ namespace Profiler
 
         AZ::CVarFixedString captureOutput = static_cast<AZ::CVarFixedString>(AZ::Debug::bg_profilerCaptureLocation);
 
-        const AZStd::string frameDataFilePath = AZStd::string::format("%s/cpu_%s_%s.json", captureOutput.c_str(), nameHint, timeString.c_str());
+        const AZ::IO::FixedMaxPathString frameDataFilePath =
+            AZ::IO::FixedMaxPathString::format("%s/cpu_%s_%s.json", captureOutput.c_str(), nameHint, timeString.c_str());
 
-        char resolvedPath[AZ::IO::MaxPathLength];
-        AZ::IO::FileIOBase::GetInstance()->ResolvePath(frameDataFilePath.c_str(), resolvedPath, AZ::IO::MaxPathLength);
-        m_lastCapturedFilePath = resolvedPath;
+        AZ::IO::FileIOBase::GetInstance()->ResolvePath(m_lastCapturedFilePath, frameDataFilePath.c_str());
 
-        return frameDataFilePath;
+        return m_lastCapturedFilePath.String();
     }
 
     void ImGuiCpuProfiler::LoadFile()
diff --git a/Gems/Profiler/Code/Source/ImGuiCpuProfiler.h b/Gems/Profiler/Code/Source/ImGuiCpuProfiler.h
index f074a9974f..2e01b8fd6b 100644
--- a/Gems/Profiler/Code/Source/ImGuiCpuProfiler.h
+++ b/Gems/Profiler/Code/Source/ImGuiCpuProfiler.h
@@ -217,7 +217,7 @@ namespace Profiler
         AZStd::vector<CpuTimingEntry> m_cpuTimingStatisticsWhenPause;
         AZStd::sys_time_t m_frameToFrameTime{};
 
-        AZStd::string m_lastCapturedFilePath;
+        AZ::IO::FixedMaxPath m_lastCapturedFilePath;
 
         bool m_showFilePicker = false;