diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2018-09-24 11:38:55 +0200 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2018-09-28 13:53:11 +0200 |
| commit | 0c98c5e20bbee5602e1d4fa40d79ddd0c456417c (patch) | |
| tree | 9607acc3649bd9619c1a7855f852b5e7c1d7fe2d /apt-pkg/cachefile.h | |
| parent | 439ae5eceae0b44315d278e963332369f0decfa0 (diff) | |
pkgCacheFile: Only unlock in destructor if locked before
pkgCacheFile's destructor unlocks the system, which is confusing
if you did not open the cachefile with WithLock set. Create a private
data instance that holds the value of WithLock.
This regression was introduced in commit b2e465d6d32d2dc884f58b94acb7e35f671a87fe:
Join with aliencode
Author: jgg
Date: 2001-02-20 07:03:16 GMT
Join with aliencode
by replacing a "Lock" member that was only initialized when the lock
was taken by calls to Lock, UnLock; with the latter also taking place
if the former did not occur.
Regression-Of: b2e465d6d32d2dc884f58b94acb7e35f671a87fe
LP: #1794053
(cherry picked from commit e02297b8e22dae04872fe6fab6dba966de65dbba)
(cherry picked from commit 248f70d425c4cd865d4bd54ab1134ccff8b68e36)
Diffstat (limited to 'apt-pkg/cachefile.h')
| -rw-r--r-- | apt-pkg/cachefile.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apt-pkg/cachefile.h b/apt-pkg/cachefile.h index e23f37675..7e2319519 100644 --- a/apt-pkg/cachefile.h +++ b/apt-pkg/cachefile.h @@ -37,8 +37,9 @@ class OpProgress; class pkgCacheFile { + struct Private; /** \brief dpointer placeholder (for later in case we need it) */ - void * const d; + Private *const d; bool ExternOwner; protected: |