Fix: m_bmqtool::Poster: remove unsafe format string passed (#603)

Signed-off-by: sameep-git <[email protected]> Signed-off-by: Sameep Shah <[email protected]> Co-authored-by: Evgeny Malygin <[email protected]>
bloomberg · Feb 7, 2025 · 665144f · 665144f
1 parent d9f8b65
commit 665144f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/applications/bmqtool/m_bmqtool_poster.cpp b/src/applications/bmqtool/m_bmqtool_poster.cpp
@@ -129,13 +129,15 @@ void PostingContext::postNext()
             }
 
             if (!d_parameters_p->sequentialMessagePattern().empty()) {
-                char buffer[128];
-                length = snprintf(
-                    buffer,
-                    sizeof(buffer),
-                    d_parameters_p->sequentialMessagePattern().c_str(),
-                    d_numMessagesPosted);
-                msg.setDataRef(buffer, length);
+                char        buffer[16];
+                bsl::string messageData(d_allocator_p);
+                length      = snprintf(buffer,
+                                  sizeof(buffer),
+                                  "%09d",
+                                  d_numMessagesPosted);
+                messageData = d_parameters_p->sequentialMessagePattern();
+                messageData.append(buffer);
+                msg.setDataRef(messageData.c_str(), messageData.length());
             }
             else {
                 // Insert latency if required...

diff --git a/src/integration-tests/test_puts_retransmission.py b/src/integration-tests/test_puts_retransmission.py
@@ -203,7 +203,7 @@ def error(test_logger, prefix, p1, p2=None):
                 + re.escape(uri[0])  # queue url
                 + r"\|(.+)\|"  # |GUID|
                 + r"msg\s*"  # "msg"
-                + r"(\d+)\|"
+                + r"(\d+)"
             )  # %d
 
             re_confirm = re.compile(
@@ -409,7 +409,7 @@ def start_producer(self, after=BACKLOG_MESSAGES):
                 "--queueuri",
                 self.uri,
                 "--messagepattern",
-                "msg%10d|",
+                "msg",
                 f"--messageProperties={self.mps}",
                 "--log",
                 producer_log,