From 1ee2032b7f4a7aa6de973d7671fc6af135cef9b5 Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Thu, 16 Jul 2015 19:05:31 -0400 Subject: check dep versions before calling strcmp Fixes a segfault when trying to remove an assumeinstalled option without a version. Signed-off-by: Andrew Gregory Signed-off-by: Allan McRae --- lib/libalpm/handle.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'lib/libalpm/handle.c') diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 5c665dbb..94452b00 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -613,10 +613,21 @@ static int assumeinstalled_cmp(const void *d1, const void *d2) const alpm_depend_t *dep1 = d1; const alpm_depend_t *dep2 = d2; - if(strcmp(dep1->name, dep2->name) == 0 && strcmp(dep1->version, dep2->version) == 0) { + if(dep1->name_hash != dep2->name_hash + || strcmp(dep1->name, dep2->name) != 0) { + return -1; + } + + if(dep1->version && dep2->version + && strcmp(dep1->version, dep2->version) == 0) { return 0; } + if(dep1->version == NULL && dep2->version == NULL) { + return 0; + } + + return -1; } -- cgit v1.2.3-24-g4f1b