xbps: merge patch from git to fix segfault in xbps-query.

This commit is contained in:
Juan RP 2013-03-13 23:17:26 +01:00
parent 1371067b7d
commit 57c73d9a34
2 changed files with 28 additions and 1 deletions

View file

@ -0,0 +1,27 @@
From dd9cf9737b7d47ba3e3ab90a49dfca340f2a8cdf Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 13 Mar 2013 23:15:42 +0100
Subject: [PATCH] xbps-query: fix segfault when listing unexistent package
files.
---
NEWS | 2 ++
bin/xbps-query/show-info-files.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/bin/xbps-query/show-info-files.c b/bin/xbps-query/show-info-files.c
index de5db5c..046eb37 100644
--- bin/xbps-query/show-info-files.c
+++ bin/xbps-query/show-info-files.c
@@ -223,6 +223,8 @@ show_pkg_files(prop_dictionary_t filesd)
for (x = 0; x < prop_array_count(array); x++) {
obj = prop_array_get(array, x);
+ if (prop_object_type(obj) != PROP_TYPE_DICTIONARY)
+ continue;
prop_dictionary_get_cstring_nocopy(obj, "file", &file);
printf("%s", file);
if (prop_dictionary_get_cstring_nocopy(obj,
--
1.8.1.3

View file

@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.21
revision=2
revision=3
build_style=configure
configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin
--enable-static --enable-debug --enable-tests"