Message ID | 20170510225457.18270-1-andrew.gregory.8@gmail.com |
---|---|
State | Accepted, archived |
Headers | show
Return-Path: <pacman-dev-bounces@archlinux.org> Delivered-To: patchwork@archlinux.org Received: from nymeria.archlinux.org by nymeria.archlinux.org (Dovecot) with LMTP id 2i7jLkmaE1mxEAAAtiB/HQ for <patchwork@archlinux.org>; Thu, 11 May 2017 00:55:05 +0200 Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id D47B44047E; Thu, 11 May 2017 00:55:02 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on nymeria.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.5 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED,T_DKIM_INVALID shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by nymeria.archlinux.org (Postfix) with ESMTPS; Thu, 11 May 2017 00:55:02 +0200 (CEST) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 831892C0EF; Wed, 10 May 2017 22:55:02 +0000 (UTC) Authentication-Results: luna.archlinux.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=b5QCD1Ci Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id AF6742C0D1 for <pacman-dev@lists.archlinux.org>; Wed, 10 May 2017 22:55:00 +0000 (UTC) Received: from nymeria.archlinux.org (nymeria.archlinux.org [IPv6:2a00:1828:2000:547::2]) by luna.archlinux.org (Postfix) with ESMTPS for <pacman-dev@lists.archlinux.org>; Wed, 10 May 2017 22:55:00 +0000 (UTC) Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id A4B6040221 for <pacman-dev@archlinux.org>; Thu, 11 May 2017 00:54:58 +0200 (CEST) Received: from mail-yb0-x243.google.com (mail-yb0-x243.google.com [IPv6:2607:f8b0:4002:c09::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by nymeria.archlinux.org (Postfix) with ESMTPS for <pacman-dev@archlinux.org>; Thu, 11 May 2017 00:54:58 +0200 (CEST) Received: by mail-yb0-x243.google.com with SMTP id b2so360972yba.3 for <pacman-dev@archlinux.org>; Wed, 10 May 2017 15:54:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=vM3UiFZkQk8lgxI7+Y5GA18c0NcahwB5Z5AOQ4JZ+k4=; b=b5QCD1CiurUfunrvwkhvkVLFNA077J6Ya8SIMR0VZmyvWSS5zbF5p4M+CnQZjF1l8A qd178F2rEzUy1MWN+3TAwUPJwXk5PMNHqMkrvo8PFLuCWtQPfOVIFY2Tcz18gYKqobD4 wO8xrx9TE4sjfKLavlBIoQvmvLyZpW72YUohnYNlQ5VXG79IKwUmDNfeM/JgkIisJkK2 NCx/qVhF5Kae8OlA/8XohiPeCkJIO1rTwPW2QufT9F/7yEQzJupgeQ3zKXrfVVyFZkRp hzh8wLjr2n9TzQDQrAzFN/hG3nZPKpU5gj5fmYofJ1VB+7ZyL1A4JbpkaClpYF2WIk3l 6QVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=vM3UiFZkQk8lgxI7+Y5GA18c0NcahwB5Z5AOQ4JZ+k4=; b=kvPgDrNrupJgScK8vOJFkiz3AQPSbXmfooZ96V/eqXeAdxkJ40ZVdDNJjFaqcHLLWD 3swlzeZVdqgTcn0rjfi4qrmZQ/FwUreyB/hq0dG39PvkYH+Imk+FYzSQGlx6+Cg+kYAM NKRCfk60rCvAZIT5vszu3q/LzhhHQLoO0j69z/N2FxZxvvMNtL7jF6WwoSh1CrdOzm/H KMJYsfG6/qITfRdh9l4VAMa8SlD56xDDkHwIKj88Lu6prCPiemCG/Yk/sAuC6N4UBW52 RbLM+ayxpPnVAK6noLzN/HMo4MSaQV2/CPcvsTL7vTv+r6BdwFE7HNLZ7a/dgbu3TB2E wVaA== X-Gm-Message-State: AODbwcByUJ/JzEn6q+DRmlt1athqInWzP5u/Y0+9ugRIYFrZFMIZXg8J hZdaJm28R75DtQ== X-Received: by 10.37.164.69 with SMTP id f63mr7345549ybi.78.1494456897285; Wed, 10 May 2017 15:54:57 -0700 (PDT) Received: from b42-desktop.local (cpe-76-182-123-164.nc.res.rr.com. [76.182.123.164]) by smtp.gmail.com with ESMTPSA id a17sm275405ywh.20.2017.05.10.15.54.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 May 2017 15:54:56 -0700 (PDT) From: Andrew Gregory <andrew.gregory.8@gmail.com> To: pacman-dev@archlinux.org Date: Wed, 10 May 2017 18:54:53 -0400 Message-Id: <20170510225457.18270-1-andrew.gregory.8@gmail.com> X-Mailer: git-send-email 2.12.2 Subject: [pacman-dev] [PATCH 1/5] alpm_unlock: check handle before dereferencing X-BeenThere: pacman-dev@archlinux.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Discussion list for pacman development <pacman-dev.archlinux.org> List-Unsubscribe: <https://lists.archlinux.org/options/pacman-dev>, <mailto:pacman-dev-request@archlinux.org?subject=unsubscribe> List-Archive: <https://lists.archlinux.org/pipermail/pacman-dev/> List-Post: <mailto:pacman-dev@archlinux.org> List-Help: <mailto:pacman-dev-request@archlinux.org?subject=help> List-Subscribe: <https://lists.archlinux.org/listinfo/pacman-dev>, <mailto:pacman-dev-request@archlinux.org?subject=subscribe> Reply-To: Discussion list for pacman development <pacman-dev@archlinux.org> Cc: Andrew Gregory <andrew.gregory.8@gmail.com> Errors-To: pacman-dev-bounces@archlinux.org Sender: "pacman-dev" <pacman-dev-bounces@archlinux.org> X-UID: 397 Status: X-Keywords: Content-Length: 600 |
Series |
[pacman-dev,1/5] alpm_unlock: check handle before dereferencing
|
expand
|
diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 502a5d9e..08625e3a 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -135,6 +135,7 @@ int _alpm_handle_lock(alpm_handle_t *handle) */ int SYMEXPORT alpm_unlock(alpm_handle_t *handle) { + ASSERT(handle != NULL, return -1); ASSERT(handle->lockfile != NULL, return 0); ASSERT(handle->lockfd >= 0, return 0);
Prevents SIGSEGV if we catch SIGINT or SIGHUP before initializing alpm. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> --- lib/libalpm/handle.c | 1 + 1 file changed, 1 insertion(+)