From 145015dc51db7ab5cafc3b0cbbe3e8d869df1f52 Mon Sep 17 00:00:00 2001 From: christianEQ Date: Thu, 8 Jul 2021 02:50:05 +0000 Subject: [PATCH 1/2] fix for #323: seg fault on expiremember Former-commit-id: f1f52af9cfcac03a1af84265f7e5cb2172e8ebde --- src/expire.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/expire.cpp b/src/expire.cpp index 06b34616a..d62b8e3c5 100644 --- a/src/expire.cpp +++ b/src/expire.cpp @@ -821,8 +821,8 @@ void expireEntryFat::expireSubKey(const char *szSubkey, long long when) fFound = true; } if (fFound) { - m_vecexpireEntries.erase(itr); dictDelete(m_dictIndex, szSubkey); + m_vecexpireEntries.erase(itr); break; } ++itr; From 229bb85dec24b27b1b0412c5a977fe2249389790 Mon Sep 17 00:00:00 2001 From: christianEQ Date: Mon, 12 Jul 2021 18:55:44 +0000 Subject: [PATCH 2/2] tabs -> spaces Former-commit-id: 0ae13c973166106efd17aa6b5dfeb80236ed862c --- src/expire.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/expire.cpp b/src/expire.cpp index d62b8e3c5..540c6eac7 100644 --- a/src/expire.cpp +++ b/src/expire.cpp @@ -822,7 +822,7 @@ void expireEntryFat::expireSubKey(const char *szSubkey, long long when) } if (fFound) { dictDelete(m_dictIndex, szSubkey); - m_vecexpireEntries.erase(itr); + m_vecexpireEntries.erase(itr); break; } ++itr;