Merge GH #2023 Avoid needless allocation in OctetString default constructor

1 files changed, 5 insertions, 2 deletions

diff --git a/src/lib/base/symkey.cpp b/src/lib/base/symkey.cpp
index 115c3ea67..4b853d995 100644
--- a/src/lib/base/symkey.cpp
+++ b/src/lib/base/symkey.cpp
@@ -26,8 +26,11 @@ OctetString::OctetString(RandomNumberGenerator& rng,
 */
 OctetString::OctetString(const std::string& hex_string)
    {
-   m_data.resize(1 + hex_string.length() / 2);
-   m_data.resize(hex_decode(m_data.data(), hex_string));
+   if(!hex_string.empty())
+      {
+      m_data.resize(1 + hex_string.length() / 2);
+      m_data.resize(hex_decode(m_data.data(), hex_string));
+      }
    }
 
 /*