From 5ab9a48599ea6bcf2fdf9b59a91791b74da3f810 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sat, 17 Apr 2021 11:35:41 -0400 Subject: [PATCH] Don't grab lock in increment_it if we are deleting cuz we will hang --- src/zm_packetqueue.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zm_packetqueue.cpp b/src/zm_packetqueue.cpp index 91629c9fd..c5c197e63 100644 --- a/src/zm_packetqueue.cpp +++ b/src/zm_packetqueue.cpp @@ -577,7 +577,7 @@ void PacketQueue::unlock(ZMLockedPacket *lp) { bool PacketQueue::increment_it(packetqueue_iterator *it) { Debug(2, "Incrementing %p, queue size %d, end? %d", it, pktQueue.size(), ((*it) == pktQueue.end())); - if ((*it) == pktQueue.end()) { + if ((*it) == pktQueue.end() or deleting) { return false; } std::unique_lock lck(mutex);