Step over empty sections in TagFiles with comments

Implementing a parser with recursion isn't the best idea, but in
practice we should get away with it for the time being to avoid
needless codechurn.

Closes: #920317 #921037

1 files changed, 6 insertions, 2 deletions

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 98001afd1..1e7f2867c 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -250,8 +250,12 @@ bool pkgTagFile::Step(pkgTagSection &Tag)
       d->chunks.erase(d->chunks.begin(), first);
    }
 
-   Tag.Trim();
-   return true;
+   if ((d->Flags & pkgTagFile::SUPPORT_COMMENTS) == 0 || Tag.Count() != 0)
+   {
+      Tag.Trim();
+      return true;
+   }
+   return Step(Tag);
 }
 									/*}}}*/
 // TagFile::Fill - Top up the buffer					/*{{{*/