commit 0d88a12c6c1e1b65e1c3f0df41d8e320c4b4954a
author Patrick Venture <venture@google.com> Mon Dec 17 07:52:04 2018 -0800
committer Patrick Venture <venture@google.com> Wed Dec 19 22:56:37 2018 +0000
tree 6e4c3edcd75f0ba97885dfa88e42b0075b031c04
parent 361bd5af41565a6abf22c7a9f2408f3961b1c451

bugfix: tools: blob: add trailing nul-terminator

Add nul-terminators to methods that pass blob_ids.

Change-Id: If9e3979dafbbc7e14697344d4440af966b4601b2
Signed-off-by: Patrick Venture <venture@google.com>

test/tools_blob_unittest.cpp

diff --git a/test/tools_blob_unittest.cpp b/test/tools_blob_unittest.cpp
index e7e0ed6..a04a741 100644
--- a/test/tools_blob_unittest.cpp
+++ b/test/tools_blob_unittest.cpp
@@ -103,7 +103,7 @@
     std::vector<std::uint8_t> request = {
         0xcf, 0xc2, 0x00, BlobHandler::BlobOEMCommands::bmcBlobStat,
         0x00, 0x00, 'a',  'b',
-        'c',  'd'};
+        'c',  'd',  0x00};
 
     /* return blob_state: 0xffff, size: 0x00, metadata 0x3445 */
     std::vector<std::uint8_t> resp = {0xcf, 0xc2, 0x00, 0x00, 0x00, 0xff, 0xff,
@@ -126,7 +126,7 @@
     std::vector<std::uint8_t> request = {
         0xcf, 0xc2, 0x00, BlobHandler::BlobOEMCommands::bmcBlobStat,
         0x00, 0x00, 'a',  'b',
-        'c',  'd'};
+        'c',  'd',  0x00};
 
     /* return blob_state: 0xffff, size: 0x00, metadata 0x3445 */
     std::vector<std::uint8_t> resp = {0xcf, 0xc2, 0x00, 0x00, 0x00, 0xff,
@@ -150,7 +150,8 @@
     std::vector<std::uint8_t> request = {
         0xcf, 0xc2, 0x00, BlobHandler::BlobOEMCommands::bmcBlobOpen,
         0x00, 0x00, 0x02, 0x04,
-        'a',  'b',  'c',  'd'};
+        'a',  'b',  'c',  'd',
+        0x00};
 
     std::vector<std::uint8_t> resp = {0xcf, 0xc2, 0x00, 0x00, 0x00, 0xfe, 0xed};
 

tools/blob_handler.cpp

diff --git a/tools/blob_handler.cpp b/tools/blob_handler.cpp
index dd4a97c..75d3cff 100644
--- a/tools/blob_handler.cpp
+++ b/tools/blob_handler.cpp
@@ -156,6 +156,7 @@
     StatResponse meta;
     std::vector<std::uint8_t> name;
     std::copy(id.begin(), id.end(), std::back_inserter(name));
+    name.push_back(0x00); /* need to add nul-terminator. */
 
     auto resp = sendIpmiPayload(BlobOEMCommands::bmcBlobStat, name);
     std::memcpy(&meta.blob_state, &resp[0], sizeof(meta.blob_state));
@@ -183,6 +184,7 @@
     std::copy(addrFlags, addrFlags + sizeof(flags),
               std::back_inserter(request));
     std::copy(id.begin(), id.end(), std::back_inserter(request));
+    request.push_back(0x00); /* need to add nul-terminator. */
 
     auto resp = sendIpmiPayload(BlobOEMCommands::bmcBlobOpen, request);
     if (resp.size() != sizeof(session))