From 830a1b8c9e9a26dc1101167ac66a75c444902c4d Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 11 Sep 2015 21:02:19 +0200 Subject: fix two memory leaks reported by gcc Reported-By: gcc -fsanitize=address -fno-sanitize=vptr Git-Dch: Ignore --- apt-pkg/metaindex.cc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'apt-pkg/metaindex.cc') diff --git a/apt-pkg/metaindex.cc b/apt-pkg/metaindex.cc index 1632b928c..5c095a2ad 100644 --- a/apt-pkg/metaindex.cc +++ b/apt-pkg/metaindex.cc @@ -32,12 +32,15 @@ metaIndex::metaIndex(std::string const &URI, std::string const &Dist, metaIndex::~metaIndex() { - if (Indexes == 0) - return; - for (std::vector::iterator I = (*Indexes).begin(); - I != (*Indexes).end(); ++I) - delete *I; - delete Indexes; + if (Indexes != 0) + { + for (std::vector::iterator I = (*Indexes).begin(); + I != (*Indexes).end(); ++I) + delete *I; + delete Indexes; + } + for (auto const &E: Entries) + delete E.second; } // one line Getters for public fields /*{{{*/ -- cgit v1.2.3