[Aptitude-svn-commit] r3709 - in branches/aptitude-0.3/aptitude: . src

[Daniel Burrows]

Author: dburrows
Date: Fri Aug  5 22:50:06 2005
New Revision: 3709

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/load_grouppolicy.cc
Log:
Don't crash when parsing an empty grouping policy.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri Aug  5 22:50:06 2005
@@ -1,5 +1,9 @@
 2005-08-05  Daniel Burrows  <dburrows at debian.org>
 
+	* src/load_grouppolicy.cc:
+
+	  Parse empty policies without crashing.
+
 	* doc/en/aptitude.xml, src/load_grouppolicy.cc, src/pkg_grouppolicy.cc, src/pkg_grouppolicy.h:
 
 	  Add support for grouping packages using debtags information.

Modified: branches/aptitude-0.3/aptitude/src/load_grouppolicy.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/load_grouppolicy.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/load_grouppolicy.cc	Fri Aug  5 22:50:06 2005
@@ -289,7 +289,9 @@
 	  }
       }
 
-    if(!rval->terminal())
+    if(rval.get() == NULL)
+      rval = auto_ptr<group_policy_parse_node>(new group_policy_end_node);
+    else if(!rval->terminal())
       rval = auto_ptr<group_policy_parse_node>(new group_policy_pair_node(rval.release(), new group_policy_end_node));
 
     assert(rval->terminal());