jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
cute-signatures
Sören Tempel 2018-06-29 15:39:56 +02:00 committed by William Pitcock
parent 6685909777
commit 5c4b90dfd4
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/list.c
View File

@ -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]");