Commit ed22a255 authored by Natanael Copa's avatar Natanael Copa

main/apk-tools: fix segfault for apk info

ref #345
parent 878a7a8c
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
pkgver=2.0.2
pkgrel=0
pkgrel=1
pkgdesc="Alpine Package Keeper - package manager for alpine"
subpackages="$pkgname-static"
depends=
makedepends="zlib-dev openssl-dev pkgconfig"
source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
info-segfault.patch
"
url="http://git.alpinelinux.org/cgit/apk-tools/"
license=GPL-2
build() {
prepare() {
cd "$srcdir/$pkgname-$pkgver"
sed -i -e 's:-Werror::' Make.rules
for i in ../*.patch; do
[ -f $i ] || continue
patch -p1 -i $i || return 1
done
}
build() {
cd "$srcdir/$pkgname-$pkgver"
make || return 1
make static || return 1
make DESTDIR="$pkgdir" install
......@@ -40,4 +44,5 @@ static() {
"$subpkgdir"/sbin/apk.static
}
md5sums="c87cb88f90eb8d7021d37e3b5386863d apk-tools-2.0.2.tar.bz2"
md5sums="c87cb88f90eb8d7021d37e3b5386863d apk-tools-2.0.2.tar.bz2
aeab86a00119f9945edd6d3c3a8bb9c1 info-segfault.patch"
commit 87420aaf295f58847332ba3aa89691a0259baace
Author: Timo Teras <timo.teras@iki.fi>
Date: Wed May 5 08:56:06 2010 +0300
info: fix querying of removed, but referenced packages
Check that package name has packages associated with it before
dereferencing the pointer. Fixes #345.
diff --git a/src/info.c b/src/info.c
index 7ca486c..d944fca 100644
--- a/src/info.c
+++ b/src/info.c
@@ -283,7 +283,7 @@ static int info_package(struct info_ctx *ctx, struct apk_database *db,
for (i = 0; i < argc; i++) {
name = apk_db_query_name(db, APK_BLOB_STR(argv[i]));
- if (name == NULL) {
+ if (name == NULL || name->pkgs == NULL) {
apk_error("Not found: %s", argv[i]);
return 1;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment