summaryrefslogtreecommitdiff
path: root/apt-pkg/deb
diff options
context:
space:
mode:
authorMichael Vogt <egon@bottom>2006-12-14 11:29:20 +0100
committerMichael Vogt <egon@bottom>2006-12-14 11:29:20 +0100
commit478707e015972cd3efea32059c97b13508705a26 (patch)
tree6c69c35fd70b57744d756539b91b7509b6d593ae /apt-pkg/deb
parentb790b130ad0a43be5738c467c16bbc2dd657ca66 (diff)
parenta7a5b0e45e2e66ab2142da8181bcc9cd0b3ba8a8 (diff)
* merged with apt--debian-sid
Diffstat (limited to 'apt-pkg/deb')
-rw-r--r--apt-pkg/deb/debindexfile.cc2
-rw-r--r--apt-pkg/deb/debsrcrecords.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index 38ecdd16a..9f435bba5 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -305,7 +305,7 @@ pkgCache::PkgFileIterator debPackagesIndex::FindInCache(pkgCache &Cache) const
pkgCache::PkgFileIterator File = Cache.FileBegin();
for (; File.end() == false; File++)
{
- if (FileName != File.FileName())
+ if (File.FileName() == NULL || FileName != File.FileName())
continue;
struct stat St;
diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc
index e1c6427e8..9e87ee5da 100644
--- a/apt-pkg/deb/debsrcrecords.cc
+++ b/apt-pkg/deb/debsrcrecords.cc
@@ -40,7 +40,7 @@ const char **debSrcRecordParser::Binaries()
{
delete [] Buffer;
// allocate new size based on buffer (but never smaller than 4000)
- BufSize = max((unsigned long)4000, max(Bins.length()+1,2*BufSize));
+ BufSize = max((unsigned long)4000, max((unsigned long)Bins.length()+1,2*BufSize));
Buffer = new char[BufSize];
}