ArmPkg/ArmDisassemblerLib: replace AsciiStrCat() with AsciiStrCatS()

[mirror_edk2.git] / ArmPkg / Library / ArmDisassemblerLib / ThumbDisassembler.c

diff --git a/ArmPkg/Library/ArmDisassemblerLib/ThumbDisassembler.c b/ArmPkg/Library/ArmDisassemblerLib/ThumbDisassembler.c
index 5bad3afcfbf636a0b05305ac4cabeef386f79a11..8c7285bcaee9cc49757f442e62894ed195db712e 100644 (file)
--- a/ArmPkg/Library/ArmDisassemblerLib/ThumbDisassembler.c
+++ b/ArmPkg/Library/ArmDisassemblerLib/ThumbDisassembler.c
@@ -397,12 +397,10 @@ ThumbMRegList (
   )\r
 {\r
   UINTN     Index, Start, End;\r
-  CHAR8     *Str;\r
   BOOLEAN   First;\r
 \r
-  Str = mThumbMregListStr;\r
-  *Str = '\0';\r
-  AsciiStrCat  (Str, "{");\r
+  mThumbMregListStr[0] = '\0';\r
+  AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, "{");\r
 \r
   for (Index = 0, First = TRUE; Index <= 15; Index++) {\r
     if ((RegBitMask & (1 << Index)) != 0) {\r
@@ -412,24 +410,24 @@ ThumbMRegList (
       }\r
 \r
       if (!First) {\r
-        AsciiStrCat  (Str, ",");\r
+        AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, ",");\r
       } else {\r
         First = FALSE;\r
       }\r
 \r
       if (Start == End) {\r
-        AsciiStrCat  (Str, gReg[Start]);\r
+        AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, gReg[Start]);\r
       } else {\r
-        AsciiStrCat  (Str, gReg[Start]);\r
-        AsciiStrCat  (Str, "-");\r
-        AsciiStrCat  (Str, gReg[End]);\r
+        AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, gReg[Start]);\r
+        AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, "-");\r
+        AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, gReg[End]);\r
       }\r
     }\r
   }\r
   if (First) {\r
-    AsciiStrCat  (Str, "ERROR");\r
+    AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, "ERROR");\r
   }\r
-  AsciiStrCat  (Str, "}");\r
+  AsciiStrCatS (mThumbMregListStr, sizeof mThumbMregListStr, "}");\r
 \r
   // BugBug: Make caller pass in buffer it is cleaner\r
   return mThumbMregListStr;\r