mirror of
https://gitlab.freedesktop.org/pkg-config/pkg-config.git
synced 2026-05-05 21:38:01 +02:00
* pkg.c (verify_package): Apply patch from Matthias Clasen of
RedHat to prevent segfaults if a Conflicts line is encountered.
This commit is contained in:
parent
6f5620089e
commit
a376c715ea
2 changed files with 5 additions and 3 deletions
|
|
@ -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.
|
||||
|
|
|
|||
5
pkg.c
5
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.
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue