Message ID | 20170912111250.31576-5-sojkam1@fel.cvut.cz |
---|---|
State | Accepted |
Headers | show
Return-Path: <lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ECWKw4S0"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xs2Jz0kBvz9s7g for <incoming@patchwork.ozlabs.org>; Tue, 12 Sep 2017 21:15:31 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=wtKJhundKCYCvfDlc2UTqB0DhYzVFB5SOC819ltur/Q=; b=ECWKw4S0EL+xzD Nfqm+fibhEw+4gTHykba49MLki9XD1Er/TDdXXMpyB20V89tOoLmBq9cKVEe+lBhxyF8GBJHQcMk6 PN7j6prCAdj2nfdNWuNvT/OKVVUmeyvXxdd9DapmZTXrupnnntW/6kFcGGaZS+SreX58VhQQ/fAaZ qLNS3Hb+7lzC7gN460AYY86hPcEUyFnskJc/VHdg8hj4h6TYVt6Ojul/MT9q5/zhYAPSOYj8qz8yw 3VXksT9d5+PlTBvO+e2rNo+6e67wdJ3ksT97WXfHiL2CyPQoyO91H4NVMEah+AOIcuYjIcAC1xQf6 GylguxEfPU1mLHXkDPHA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1drjA4-0006k9-PD; Tue, 12 Sep 2017 11:15:24 +0000 Received: from smtpx.feld.cvut.cz ([147.32.192.33]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1drj8M-0004UZ-0e for lede-dev@lists.infradead.org; Tue, 12 Sep 2017 11:13:45 +0000 Received: from localhost (unknown [192.168.200.7]) by smtpx.feld.cvut.cz (Postfix) with ESMTP id 5EDBCDC3C7; Tue, 12 Sep 2017 13:13:14 +0200 (CEST) X-Virus-Scanned: IMAP STYX AMAVIS Received: from smtpx.feld.cvut.cz ([192.168.200.6]) by localhost (styx.feld.cvut.cz [192.168.200.7]) (amavisd-new, port 10054) with ESMTP id jo1fcH02uhQV; Tue, 12 Sep 2017 13:13:13 +0200 (CEST) Received: from imap.feld.cvut.cz (imap.feld.cvut.cz [147.32.192.34]) by smtpx.feld.cvut.cz (Postfix) with ESMTP id F04B0DC3D0; Tue, 12 Sep 2017 13:13:12 +0200 (CEST) Received: from wsh by steelpick.2x.cz with local (Exim 4.89) (envelope-from <sojkam1@fel.cvut.cz>) id 1drj7w-0008ED-UY; Tue, 12 Sep 2017 13:13:12 +0200 From: Michal Sojka <sojkam1@fel.cvut.cz> To: lede-dev@lists.infradead.org Date: Tue, 12 Sep 2017 13:12:34 +0200 Message-Id: <20170912111250.31576-5-sojkam1@fel.cvut.cz> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170912111250.31576-1-sojkam1@fel.cvut.cz> References: <20170912111250.31576-1-sojkam1@fel.cvut.cz> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170912_041338_305866_64E03291 X-CRM114-Status: UNSURE ( 6.67 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [147.32.192.33 listed in list.dnswl.org] -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Subject: [LEDE-DEV] [PATCH procd 02/17] utrace: Fix off-by-one errors X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <lede-dev.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/lede-dev>, <mailto:lede-dev-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/lede-dev/> List-Post: <mailto:lede-dev@lists.infradead.org> List-Help: <mailto:lede-dev-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/lede-dev>, <mailto:lede-dev-request@lists.infradead.org?subject=subscribe> Cc: Michal Sojka <sojkam1@fel.cvut.cz> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Lede-dev" <lede-dev-bounces@lists.infradead.org> Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
Series |
[LEDE-DEV,procd,01/17] utrace: Fix environment initialization
|
expand
|
diff --git a/trace/trace.c b/trace/trace.c index 04bf7a5..65fe067 100644 --- a/trace/trace.c +++ b/trace/trace.c @@ -177,7 +177,7 @@ int main(int argc, char **argv, char **envp) char **_argv = calloc(argc + 1, sizeof(char *)); char **_envp; char *preload = "LD_PRELOAD=/lib/libpreload-trace.so"; - int envc = 1; + int envc = 0; int ret; memcpy(_argv, argv, argc * sizeof(char *)); @@ -185,7 +185,7 @@ int main(int argc, char **argv, char **envp) while (envp[envc++]) ; - _envp = calloc(envc, sizeof(char *)); + _envp = calloc(envc + 1, sizeof(char *)); memcpy(&_envp[1], envp, envc * sizeof(char *)); *_envp = preload;
This fixes two errors: 1) memcpy() copies envc elements starting from index 1, so the number of elements in target array should be envc + 1. But only envc was allocated. 2) If original environment envp is empty, i.e. it contains only a NULL element, the while loop misses it. Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz> --- trace/trace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)