From 2181eca5de173867abc6d326cac5d8df943e5fd3 Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Mon, 29 Jul 2019 17:09:51 -0400
Subject: [PATCH] Fix crash setting expire on a key with an existing subkey
 expiration

Former-commit-id: 4858fd893c8e638b0efdcd3ab2c6dc188a6dc6bd
---
 src/server.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/server.h b/src/server.h
index 52c9877e6..9c5623fe9 100644
--- a/src/server.h
+++ b/src/server.h
@@ -801,7 +801,8 @@ public:
     void expireSubKey(const char *szSubkey, long long when)
     {
         auto itrInsert = std::lower_bound(m_vecexpireEntries.begin(), m_vecexpireEntries.end(), when);
-        m_vecexpireEntries.emplace(itrInsert, when, sdsdup(szSubkey));
+        const char *subkey = (szSubkey) ? sdsdup(szSubkey) : nullptr;
+        m_vecexpireEntries.emplace(itrInsert, when, subkey);
     }
 
     bool FEmpty() const noexcept { return m_vecexpireEntries.empty(); }