* apt-pkg/contrib/configuration.cc:

  - fix double delete (LP: #848907)
  - ignore only the invalid regexp instead of all options

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index ece05e8f630db3d8c9894fa754f542cd1253b9c9..2db191ba294f7edb4caa3608f789217b38fc7d14 100644 (file)
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -870,10 +870,10 @@ Configuration::MatchAgainstConfig::MatchAgainstConfig(char const * Config)
       {
         regfree(p);
         delete p;
-        clearPatterns();
-        _error->Warning("Regex compilation error for '%s' in configuration option '%s'",
-                               s->c_str(), Config);
-        return;
+        _error->Warning("Invalid regular expression '%s' in configuration "
+                         "option '%s' will be ignored.",
+                         s->c_str(), Config);
+        continue;
       }
    }
    if (strings.size() == 0)
@@ -894,6 +894,7 @@ void Configuration::MatchAgainstConfig::clearPatterns()
       regfree(*p);
       delete *p;
    }
+   patterns.clear();
 }
                                                                        /*}}}*/
 // MatchAgainstConfig::Match - returns true if a pattern matches       /*{{{*/

diff --git a/debian/changelog b/debian/changelog
index 21a1bf216e282bf45c125f2f81826e1a05edd624..5c133521c82c6816e38018eafa265e2ef16c6609 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ apt (0.8.15.8) UNRELEASED; urgency=low
   * cmdline/apt-get.cc:
     - output list of virtual package providers to c1out in -q=1
       instead of /dev/null to unbreak sbuild (LP: #816155)
+  
+  [ Michael Vogt ]
+  * apt-pkg/contrib/configuration.cc:
+    - fix double delete (LP: #848907)
+    - ignore only the invalid regexp instead of all options
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 13 Sep 2011 17:39:10 +0200