summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2018-06-13 18:45:12 +0200
committerJulian Andres Klode <julian.klode@canonical.com>2018-06-26 12:50:47 +0200
commit03122fbd056017807ee53579ac1e3fb6919ebcae (patch)
treea04ac0fa3e09bc215b5841890f380e549e742cd1
parentdb58513e6e5a83610c664641854e4dfeb723f9e8 (diff)
Fix lock counting in debSystem
debSystem uses a reference counted lock, so you can acquire it multiple times in your applications, possibly nested. Nesting locks causes a fd leak, though, as we only increment the lock count when we already have locked twice, rather than once, and hence when we call lock the second time, instead of increasing the lock count, we open another lock fd. This fixes the code to check if we have locked at all (> 0). There is no practical problem here aside from the fd leak, as closing the new fd releases the lock on the old one due to the weird semantics of fcntl locks. (cherry picked from commit 79f012bd09ae99d4c9d63dc0ac960376b5338b32) (cherry picked from commit 1edcb718293f24ad190703a345f8f868b6e3bcc4) LP: #1778547
-rw-r--r--apt-pkg/deb/debsystem.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index 3ad25ba05..2bb887e75 100644
--- a/apt-pkg/deb/debsystem.cc
+++ b/apt-pkg/deb/debsystem.cc
@@ -78,7 +78,7 @@ debSystem::~debSystem()
bool debSystem::Lock()
{
// Disable file locking
- if (_config->FindB("Debug::NoLocking",false) == true || d->LockCount > 1)
+ if (_config->FindB("Debug::NoLocking",false) == true || d->LockCount > 0)
{
d->LockCount++;
return true;