From: Tollef Fog Heen <tfheen@err.no>
Date: Sat, 29 Dec 2007 15:46:25 +0000 (+0100)
Subject: 	* pkg.c (verify_package): Apply patch from Matthias Clasen of
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a376c715eadbce1b0d5c11877b9dd5ba804b8856;p=pkg-config

	* pkg.c (verify_package): Apply patch from Matthias Clasen of
	RedHat to prevent segfaults if a Conflicts line is encountered.
---

diff --git a/ChangeLog b/ChangeLog
index f191c7d..48b54eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-12-29  Tollef Fog Heen  <tfheen@err.no>
 
+	* pkg.c (verify_package): Apply patch from Matthias Clasen of
+	RedHat to prevent segfaults if a Conflicts line is encountered.
+
 	* popthelp.c: Apply patch from Tom Tromey <tromey@redhat.com> to
 	make pkg-config --help print to stdout, not stderr.  Gnome
 	#127314.
diff --git a/pkg.c b/pkg.c
index bb21337..a4bf905 100644
--- a/pkg.c
+++ b/pkg.c
@@ -821,7 +821,7 @@ verify_package (Package *pkg)
    */
   
   recursive_fill_list (pkg, get_requires_private, &requires);
-  recursive_fill_list (pkg, get_conflicts, &conflicts);
+  conflicts = get_conflicts (pkg);
 
   requires_iter = requires;
   while (requires_iter != NULL)
@@ -843,7 +843,7 @@ verify_package (Package *pkg)
                              req->version, req->name,
                              ver->name,
                              comparison_to_str (ver->comparison),
-                             ver->version,
+                             ver->version ? ver->version : "(any)",
                              ver->owner->name,
                              ver->owner->version);
 
@@ -857,7 +857,6 @@ verify_package (Package *pkg)
     }
   
   g_slist_free (requires);
-  g_slist_free (conflicts);
 
   /* We make a list of system directories that gcc expects so we can remove
    * them.