From 5c4b90dfd48d476b9e7aae2ad6627dd6f03ac557 Mon Sep 17 00:00:00 2001 From: Sören Tempel Date: Fri, 29 Jun 2018 15:39:56 +0200 Subject: list: fix segmentation fault with virtual packages Virtual packages have the origin pointer set to NULL. Trying to print it using the BLOB_PRINTF macros causes a segmentation fault. Inspired by the `print_origin_name` function from `src/search.c` this commit attempts to fix it by checking whether `pkg->origin` is NULL before attempting to print it. If it is NULL the pkg name is printed instead. Since printing the pkg name requires a different format string this commit splits the printf call for printing the package line into multiple ones. The output format shouldn't have changed at all though. --- src/list.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/list.c b/src/list.c index 14f5fb5..e285e3f 100644 --- a/src/list.c +++ b/src/list.c @@ -101,9 +101,15 @@ static const struct apk_package *is_upgradable(struct apk_name *name, const stru static void print_package(const struct apk_package *pkg, const struct list_ctx *ctx) { - printf(PKG_VER_FMT " " BLOB_FMT " {" BLOB_FMT "} (" BLOB_FMT ")", - PKG_VER_PRINTF(pkg), BLOB_PRINTF(*pkg->arch), BLOB_PRINTF(*pkg->origin), - BLOB_PRINTF(*pkg->license)); + printf(PKG_VER_FMT " " BLOB_FMT " ", + PKG_VER_PRINTF(pkg), BLOB_PRINTF(*pkg->arch)); + + if (pkg->origin != NULL) + printf("{" BLOB_FMT "}", BLOB_PRINTF(*pkg->origin)); + else + printf("{%s}", pkg->name->name); + + printf(" (" BLOB_FMT ")", BLOB_PRINTF(*pkg->license)); if (pkg->ipkg) printf(" [installed]"); -- cgit v1.2.3-70-g09d2