commit ede9c9f6684e7d8367f039c48839e464d3d34eaf
author Patrick Venture <venture@google.com> Wed Sep 30 13:49:19 2020 -0700
committer Patrick Venture <venture@google.com> Wed Sep 30 23:35:26 2020 +0000
tree 69850ce09be819559b41ecb3ad1a8fb0c8c86844
parent 4b1b045057907e7fd51a7ea240f1c0e384c27c0f

util: use constexpr string instead of string objects

This handles an initialization order issue found with address
santization testing.

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

bmc/firmware_handler.cpp

diff --git a/bmc/firmware_handler.cpp b/bmc/firmware_handler.cpp
index ccd76d3..d71cc9f 100644
--- a/bmc/firmware_handler.cpp
+++ b/bmc/firmware_handler.cpp
@@ -464,18 +464,18 @@
     }
 
     Session* curr;
-    const std::string* active;
+    const char* active;
 
     if (path == hashBlobId)
     {
         /* 2c) are they opening the /flash/hash ? (to start the process) */
         curr = &activeHash;
-        active = &activeHashBlobId;
+        active = activeHashBlobId;
     }
     else
     {
         curr = &activeImage;
-        active = &activeImageBlobId;
+        active = activeImageBlobId;
     }
 
     curr->flags = flags;
@@ -484,7 +484,7 @@
 
     lookup[session] = curr;
 
-    addBlobId(*active);
+    addBlobId(active);
     removeBlobId(verifyBlobId);
 
     changeState(UpdateState::uploadInProgress);