ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix packetqueue corruption. Can't wait after grabbing the packet.

pull/3208/head
Isaac Connor 2021-03-31 16:49:14 -04:00
parent ddb62a27c6
commit 22d713cd9c
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/zm_packetqueue.cpp
View File

@ -546,18 +546,11 @@ ZMLockedPacket *PacketQueue::get_packet(packetqueue_iterator *it) {
Error("Null p?!");
return nullptr;
}
// Packets are only deleted by packetqueue, so lock must be held.
// We shouldn't have to trylock. Someone else might hold the lock but not for long
ZMLockedPacket *lp = new ZMLockedPacket(p);
Debug(3, "get_packet %p image_index: %d, about to lock packet", p, p->image_index);
while (!(zm_terminate or deleting) and !lp->trylock()) {
Debug(2, "waiting on index %d. Queue size %d it == end? %d",
p->image_index, pktQueue.size(), ( *it == pktQueue.end() ) );
condition.wait(lck);
}
if (deleting or zm_terminate) {
// packet may have been deleted so we can't delete the lp FIXME
return nullptr;
}
lp->lock();
Debug(2, "Locked packet %d, unlocking packetqueue mutex", p->image_index);
return lp;
} // end ZMLockedPacket *PacketQueue::get_packet(it)