summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 17:03:33 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 17:03:33 +0000
commitf50d1cfa663d55b2b37e98c625bb7d78424fd4ca (patch)
treedcafc7852bf8f207820040283896ed6232fc2c82
parent506a66fe1cdcd16253591fd8d262516914ca624b (diff)
Back out fix for now; not sure I want to bump the lib v...
Author: mdz Date: 2003-09-02 04:52:16 GMT Back out fix for now; not sure I want to bump the lib version yet
-rw-r--r--apt-pkg/pkgrecords.cc8
-rw-r--r--debian/changelog2
2 files changed, 2 insertions, 8 deletions
diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc
index a7dec76a7..9c2655d6a 100644
--- a/apt-pkg/pkgrecords.cc
+++ b/apt-pkg/pkgrecords.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: pkgrecords.cc,v 1.7 2003/09/02 04:46:18 mdz Exp $
+// $Id: pkgrecords.cc,v 1.8 2003/09/02 04:52:16 mdz Exp $
/* ######################################################################
Package Records - Allows access to complete package description records
@@ -42,10 +42,6 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0)
if (Files[I->ID] == 0)
return;
}
-
- // We store this to make sure that the destructor won't segfault,
- // even if the Cache object was destructed before this instance.
- PackageFileCount = Cache.HeaderP->PackageFileCount;
}
/*}}}*/
// Records::~pkgRecords - Destructor /*{{{*/
@@ -53,7 +49,7 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0)
/* */
pkgRecords::~pkgRecords()
{
- for (unsigned I = 0; I != PackageFileCount; I++)
+ for (unsigned I = 0; I != Cache.HeaderP->PackageFileCount; I++)
delete Files[I];
delete [] Files;
}
diff --git a/debian/changelog b/debian/changelog
index 1c37b8142..b3998e196 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,6 @@ apt (0.5.11) unstable; urgency=low
(Closes: #208302)
* In apt.conf(5), give the fully qualified name of Dir::Bin::Methods,
rather than just "methods"
- * Small bugfix to pkgRecords to prevent a segfault if the pkgCache is
- destroyed before it (from Conectiva's apt-rpm)
--