diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2012-05-02 22:00:02 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2012-05-02 22:00:02 +0200 |
| commit | 5954d4d2020a247d414c7e064a87f9464be85fcf (patch) | |
| tree | b7870b8925d097daaffd5465c5726bb92c5b7321 | |
| parent | 154fd04e8870577626fa43546f40273f6edbc9f3 (diff) | |
| download | apt-5954d4d2020a247d414c7e064a87f9464be85fcf.tar.gz | |
* apt-pkg/pkgcachegen.cc:
- check if NewDescription allocation has failed and error out accordingly
| -rw-r--r-- | apt-pkg/pkgcachegen.cc | 6 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index ec072fddd..5e0726f3b 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -304,6 +304,9 @@ bool pkgCacheGenerator::MergeListPackage(ListParser &List, pkgCache::PkgIterator void const * const oldMap = Map.Data(); map_ptrloc const descindex = NewDescription(Desc, CurLang, CurMd5, *LastDesc); + if (unlikely(descindex == 0 && _error->PendingError())) + return _error->Error(_("Error occurred while processing %s (%s%d)"), + Pkg.Name(), "NewDescription", 1); if (oldMap != Map.Data()) LastDesc += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; *LastDesc = descindex; @@ -456,6 +459,9 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator oldMap = Map.Data(); map_ptrloc const descindex = NewDescription(Desc, CurLang, CurMd5, *LastDesc); + if (unlikely(descindex == 0 && _error->PendingError())) + return _error->Error(_("Error occurred while processing %s (%s%d)"), + Pkg.Name(), "NewDescription", 2); if (oldMap != Map.Data()) LastDesc += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap; *LastDesc = descindex; diff --git a/debian/changelog b/debian/changelog index d77de1b3a..799653d5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,8 +26,10 @@ apt (0.9.3) unstable; urgency=low like one provided with RootDir triggers the usage of EDSP * debian/libapt-inst1.5.symbols: - use the correct library name the symbols header + * apt-pkg/pkgcachegen.cc: + - check if NewDescription allocation has failed and error out accordingly - -- David Kalnischkies <kalnischkies@gmail.com> Wed, 02 May 2012 19:18:51 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Wed, 02 May 2012 21:59:02 +0200 apt (0.9.2) unstable; urgency=low |