From 7c08efde2a31df82e775ec773cd8e36a9a1ba64f Mon Sep 17 00:00:00 2001
From: Ioannis Assiouras <Ioannis.Assiouras@amd.com>
Date: Tue, 19 Dec 2023 21:14:53 +0000
Subject: [PATCH] SWDEV-438299 - Fixed out of bounds memory access in
 ExtractFatBinaryUsingCOMGR

Change-Id: Ib1c6a38da0b81b78d250d7fb88d1194864a0251d


[ROCm/clr commit: 5158ec1c00007d92874076d7611612b6553ff3fb]
---
 projects/clr/hipamd/src/hip_fatbin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/clr/hipamd/src/hip_fatbin.cpp b/projects/clr/hipamd/src/hip_fatbin.cpp
index 3367ee82e5..56e963287d 100644
--- a/projects/clr/hipamd/src/hip_fatbin.cpp
+++ b/projects/clr/hipamd/src/hip_fatbin.cpp
@@ -226,10 +226,10 @@ hipError_t FatBinaryInfo::ExtractFatBinaryUsingCOMGR(const std::vector<hip::Devi
     query_list_array = new amd_comgr_code_object_info_t[unique_isa_names.size()];
     auto isa_it = unique_isa_names.begin();
     for (size_t isa_idx = 0; isa_idx < unique_isa_names.size(); ++isa_idx) {
-      std::advance(isa_it, isa_idx);
       query_list_array[isa_idx].isa = isa_it->first.c_str();
       query_list_array[isa_idx].size = 0;
       query_list_array[isa_idx].offset = 0;
+      isa_it ++;
     }
 
     // Look up the code object info passing the query list.