From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14015 invoked by alias); 6 Jan 2015 05:26:28 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 34109 Received: (qmail 7963 invoked from network); 6 Jan 2015 05:26:26 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=tR/0Z0Cq9kWipdtM4SoQrpaCbkYeAW1nrKf1CuZN3r4=; b=M39FM6lGSfmibwt/pnax8VnrbTyFojux1wsSPuEZ1IbYL5yKOG5h9GDvU4NOd+sa0i XXw4CDEZbZvLvwP1zG1wVS+wPVLgdcvJ/ELX4gd2rT7OFKvyGcqdzKzsxdEndu7S11Ia r6qlONPuw+zOygsG9v0bdoLry6A1/3bvxWSu5l2zCJekGz+G9mIi7806BiB96SYl08w8 LIiaNQR/u3bcN/En55TUhVMRmJb3kDoGeO9Peur1hZCgjUd/F/m0Z5i0XMAsLDJ4BjHV L2tqs7S3uZyfV/6zumrSA7dk9AwUViiIGUw7oZsTb7BV11+Fd3rsCKV6ymyMdk+D9uCw YI/g== X-Received: by 10.194.63.51 with SMTP id d19mr153926731wjs.77.1420521985379; Mon, 05 Jan 2015 21:26:25 -0800 (PST) From: Mikael Magnusson To: zsh-workers@zsh.org Subject: PATCH 17/17: check widthp before deref (is this okay, or should it be *swidep = buf + *widthp ? *widthp : 0; or something) Date: Tue, 6 Jan 2015 06:25:49 +0100 Message-Id: <1420521949-30483-18-git-send-email-mikachu@gmail.com> X-Mailer: git-send-email 2.2.0.GIT In-Reply-To: <1420521949-30483-1-git-send-email-mikachu@gmail.com> References: <1420521949-30483-1-git-send-email-mikachu@gmail.com> --- Src/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/utils.c b/Src/utils.c index 72a0c9c..c10fb11 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -565,7 +565,7 @@ wcs_nicechar(wchar_t c, size_t *widthp, char **swidep) *swidep = buf + strlen(buf); return buf; } - if (swidep) + if (swidep && widthp) *swidep = buf + *widthp; return buf; } -- 2.2.0.GIT