From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23078 invoked by alias); 14 Jan 2018 15:24:05 -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: List-Unsubscribe: X-Seq: 42276 Received: (qmail 17870 invoked by uid 1010); 14 Jan 2018 15:24:05 -0000 X-Qmail-Scanner-Diagnostics: from mail-pl0-f65.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(209.85.160.65):SA:0(-1.9/5.0):. Processed in 11.687121 secs); 14 Jan 2018 15:24:05 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_PASS,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.1 X-Envelope-From: joeypabalinas@gmail.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1pBdquXwTKE6tTMVcTeuoGemhPIA4m0V/uTycRMMqpc=; b=Eb8M+yeqO+vtCNriHJ8XoqWXup4yQZ/raWvGPK1oFFYhkvzN/v7G29faqzmRtAjHRi S8CgIdrH2yixjQqtE5SFnjNMtdaZqdwov5I1U0/6YPIC6R9JPFvQG+vOqGnrkcxxRSIH GESfIO0jQruujeYzIXScm537ou27hNCEzE00UM4w6fKNHKkhWEoDF13xqxl3Z1GPu+kJ psbFvXpUMmRk5OD3zWMTvMSqQYP4OD2ORI68tXciI6Gz6qNTbr0fq12PdGhiXaSrBNZE hl9j2PVT2+4inOwK97Ls2ZKVomowAikPzVeHoEO9ZQ/oCfK/jVvDlu/wdJN04XBDuLBq d+QA== 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:in-reply-to :references; bh=1pBdquXwTKE6tTMVcTeuoGemhPIA4m0V/uTycRMMqpc=; b=mJ3JySm/yKuyzqXuSCFOnh5Wpcc7AMTMkYzs0t8Xd2+vK0QI0+/yMKVFvm9StpsmO0 Rjc2BAINHwji6kHOI0F041vCOeW+MUsla7KB4uSwUTaLr4BlBublESHfFSGXzymby3Jo i6fY3gv0limwnRC7BwsrjeaOPU+p69uatEtXygax3Vz0XHb+dkQiWXdTuKGMofyRi+Mv eenOcU4E1GJeRpwpx8WIK8L95tUh0Lu0RvzxoQHDfpdigDmb72hdHDCyoS2qA2TR3j63 FuzYjEW+MFwAghjO/kon3XQ2/IltghXSl17i9i/ImikYZWE0268ZYQvrzsUF11sNe/of WPEA== X-Gm-Message-State: AKGB3mKf5tacOCRh4lEmPMu53irDp9XscT3QTM+Q3T3tycWd2/KwdiUy 0EeF1lTMj3J5QKVVsraOJN9OAw== X-Google-Smtp-Source: ACJfBouw6ViB3zn+OMCFvfZ3Ksyzl4GyV6jpbE4cyxIbt7pzRTtD8im8gk0f13J53leHLQnP7q6KYQ== X-Received: by 10.84.238.197 with SMTP id l5mr25491624pln.443.1515943431839; Sun, 14 Jan 2018 07:23:51 -0800 (PST) From: Joey Pabalinas To: schaefer@brasslantern.com Cc: dana@dana.is, zsh-workers@zsh.org, Joey Pabalinas Subject: [PATCH 3/3] jp: Add `dupstring()` fallback to `zhtricat()` Date: Sun, 14 Jan 2018 05:23:44 -1000 Message-Id: <20180114152344.12018-4-joeypabalinas@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180114152344.12018-1-joeypabalinas@gmail.com> References: <20180114152344.12018-1-joeypabalinas@gmail.com> Add `dupstring()` fallback machanism to guard against NULL derefs in 3-argument concat function. Signed-off-by: Joey Pabalinas 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Src/string.c b/Src/string.c index 038624d65a9f533494..df7e932061dbfbaab2 100644 --- a/Src/string.c +++ b/Src/string.c @@ -126,9 +126,16 @@ mod_export char * zhtricat(char const *s1, char const *s2, char const *s3) { char *ptr; - size_t l1 = strlen(s1); - size_t l2 = strlen(s2); + size_t l1, l2; + /* String duplicate fallback to prevent NULL derefs */ + if (!s1 && !s2) + return dupstring(s3); + if (!s1) + l1 = 0, s1 = s2; + else + l1 = strlen(s1); + l2 = strlen(s2); ptr = (char *)zhalloc(l1 + l2 + strlen(s3) + 1); strcpy(ptr, s1); strcpy(ptr + l1, s2); -- 2.15.1