From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6384 invoked by alias); 6 Jan 2015 05:54:53 -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: 34116 Received: (qmail 25861 invoked from network); 6 Jan 2015 05:54:51 -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=PzNRFgV2IOHhJVFrcNUo3LhnnQ7cAJKidPqS+af8s4c=; b=ELr22ixrdGr8638LTv8nLhMJ7pJeSX4pg7xSCJoJ1lLPmm0m7FczdWRTEL/+E7vkL3 KqByuBJjvR2oTrIQ52yPrsvSg6R34l43Z4y4zEIQnW5zEuwDigkFhGgV7Vrz3lHZ6ns7 +dy7J+p94SV7yjxlTzrLAWRGwicihSnUkNDi1ITG+ioP2AEyJy0KH0PlNmKw5To9YRtG s4+7HqufIqkEPiGhX2kOYgbEJfSifJ5EipzUhBiabDoNpar1aeHaHpJs8LolerVNWeut jju+lMPEU26TbRMKNueYOAKK1tIXi719OIlHz3/SCjyIFXnlcC0GITQCeiPYEGLJ2HVu qSlg== X-Received: by 10.194.156.202 with SMTP id wg10mr188597341wjb.59.1420521969050; Mon, 05 Jan 2015 21:26:09 -0800 (PST) From: Mikael Magnusson To: zsh-workers@zsh.org Subject: PATCH 03/17: computil: Check for NULL before passing to strlen Date: Tue, 6 Jan 2015 06:25:35 +0100 Message-Id: <1420521949-30483-4-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> The rest of this function appears to be very careful about checking these, then forgets in this one spot. Found by Coverity (Issue 1255805). --- Src/Zle/computil.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c index b11c39f..a81d1dd 100644 --- a/Src/Zle/computil.c +++ b/Src/Zle/computil.c @@ -4060,7 +4060,8 @@ cfp_test_exact(LinkList names, char **accept, char *skipped) if (sl > PATH_MAX2) return NULL; - suf = dyncat(skipped, rembslash(dyncat(compprefix, compsuffix))); + suf = dyncat(skipped, rembslash(dyncat(compprefix ? compprefix : "", + compsuffix ? compsuffix : ""))); for (node = firstnode(names); node; incnode(node)) { l = strlen(p = (char *) getdata(node)); -- 2.2.0.GIT