summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <egon@tas>2006-12-07 10:32:06 +0100
committerMichael Vogt <egon@tas>2006-12-07 10:32:06 +0100
commitf6442c7777b437ea7381dd781ffc50c76264bb48 (patch)
tree66a189804439206e02fbec6dc5cdc3e63ea2b6f8
parentf88137b8972f57c52bbadf54a80932f225562a95 (diff)
* apt-pkg/deb/debindexfile.cc:
- File.FileName() == NULL check added * apt-pkg/deb/debsrcrecords.cc: - fix FTBFS on i386
-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 ff8bce85d..234521efe 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];
}