From patchwork Thu Dec 17 08:45:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Ardelean X-Patchwork-Id: 558103 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D39EC1402ED for ; Thu, 17 Dec 2015 19:45:47 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=CWS3XMRI; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id C2BA2284DDF; Thu, 17 Dec 2015 09:45:21 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 0CC1428BC2C for ; Thu, 17 Dec 2015 09:45:15 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Thu, 17 Dec 2015 09:45:14 +0100 (CET) Received: by mail-wm0-f45.google.com with SMTP id p187so12797198wmp.0 for ; Thu, 17 Dec 2015 00:45:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=fn0JET8q3BSLnGqoUYDVoAUt9TPEo98qNzkYI+n/ugY=; b=CWS3XMRI5TkzLzwTZnlwwzSSuBj7yvpXxtxZ2CYcrBBVtu206cdTefApXTWvlpGJGc dyoTB2cYMueYPjTY7ecaH2PdAI+Ja4vDOfszh5ruthAiwnfCrTCFNpIV05GNGnnFlphF wTKDTy/01F9dl1SJ7AcKvTxhpdxYJ4S25gBvU/v9uaBO/0g6hv1IlMYYzMtuKR9EVvH+ D2COq+ovmPS6vTQQop2zr1yHJ7pYZMWQ3XnxxBNugVBeV2uC985SfQXfm6DFrGkl02E7 TY3xQfHqM+0m2L/vXYJnyI84GkpYBV+nt/K592smu2wfKCTPqLp1Xo9OXdk95HeYwETr 8BDQ== X-Received: by 10.28.15.213 with SMTP id 204mr2385667wmp.80.1450341929776; Thu, 17 Dec 2015 00:45:29 -0800 (PST) Received: from orion.ocedo.cluj.local ([5.2.198.78]) by smtp.gmail.com with ESMTPSA id jm4sm9349471wjb.7.2015.12.17.00.45.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Dec 2015 00:45:29 -0800 (PST) From: Alexandru Ardelean X-Google-Original-From: Alexandru Ardelean To: openwrt-devel@lists.openwrt.org Date: Thu, 17 Dec 2015 10:45:22 +0200 Message-Id: <1450341922-24439-1-git-send-email-aa@ocedo.com> X-Mailer: git-send-email 2.1.4 Cc: Alexandru Ardelean Subject: [OpenWrt-Devel] [PATCH] libubus: add null for ubus_context object in ubus_shutdown() X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" At the moment, we do our own null checks before calling ubus_free(). The likely-hood of 'ctx' being null (in ubus_free()) is low, but since free() handles null, might make sense for ubus_free() to do so as well. Signed-off-by: Alexandru Ardelean --- libubus.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libubus.c b/libubus.c index ccaa069..88a6ad3 100644 --- a/libubus.c +++ b/libubus.c @@ -354,6 +354,8 @@ struct ubus_context *ubus_connect(const char *path) void ubus_shutdown(struct ubus_context *ctx) { blob_buf_free(&b); + if (!ctx) + return; close(ctx->sock.fd); free(ctx->msgbuf.data); }