From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 24566 invoked from network); 26 Dec 2023 05:49:18 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 26 Dec 2023 05:49:18 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1703569758; b=YF7jFm8Y6cs37VJNq9uHRV/sFJhDwpKr4De/f/nHcaquiX0Kvv/Wa6dYIEeYZbjj2ln3LoH2o0 zwF86p2Utgv+vqU/aUtd4q4PwsbZOURYztB4+QF6HThSD4S4lg5Nj9H/4+EGKfahrfJv15fJ3s 1pZjpVmWsBMFpqE13BrAqeE0eiroYj1cC+qy5qNO+Ex9otS1Wv51ARByBUxLl2Pi6NvLwfMccg cgm8OiAylt7mSztzmQiTozappKIYYGjQmzvjQNtyfaWg6rhCWwHyZ02OzFVzV/KYOVNkGTxNUs 3sYcKiYgdwKBLJ83EhDe/NCBVgdHCjBVv6c0dAMEJ70ACg==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-oi1-f179.google.com) smtp.remote-ip=209.85.167.179; dkim=pass header.d=gmail.com header.s=20230601 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1703569758; bh=xbitEmfBMJrZnIVL+gd0IYu+L9of1ygcjgQXNlfRhi8=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:MIME-Version:Message-ID:Date: Subject:Cc:To:From:DKIM-Signature:DKIM-Signature; b=D2RrRzzgQ0iyZMrm1Oc1jPq4X04GJfKzsvLB9rrxCLyH2KesXRC91nSPZ51pT+9eh5+/ocRIds v9tLUAq2Od6AVkcQORl8nmuH4D9quzcKS2dXOohHcy2ZcFF9k8g7iznZ42QCo10D6eW0G+uRvU 5prlw11BJ2nzR26IdtXLUrjzcgFHoEjxJWmxTtem+3XkrhDhv0gDxLQ7yT/rLf1edwmi0Wc3o5 +p/YyJtVcQRrA2LoAmGpMcODRtkBCl2xck94fj1LhdS4RqtK/DWnyuvOfv2IdUUqaHxqCmJviK p1uX4HS4kLCLdXm5EIkqbBGpuWQanR5TLz/CPQN9yCKJpQ==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References; bh=cbbo0YrqAjKFW1st6C8uqlAuYFV6ndSXDyIZO4HWYj8=; b=JjI3PKeoflYrIXtLyaRVaTm4bC E1UxxCXyCdunlbtbt3yc3nmj9Y62pvITGhzjcbYRBZqiM3z6/8HeYTmfy+969JxUaNiuardG9AhQo fX30oqNuXBFV5FE/vp7h3vY4xBrWWljIR9nZNRJ9qpPdTBhNttl+7R6O1j3ATj87ZNiLL84fbCZbC qtXKTbe6/CM6z2NmZBOs+00fSIGAPdcLQA8t+70LgHJaw1m+CYdbEJ0nS2vbbo+jeBD8p4s7YaagB i38T/kuPbJiZ1fPIzSOH08cjt5N28oWnC91WxycNLJJ3U4D3X+RuFgRzMipp/uEn1jocIHZrMfj7H HMHOFDgA==; Received: by zero.zsh.org with local id 1rI0JX-000Euz-QU; Tue, 26 Dec 2023 05:49:15 +0000 Authentication-Results: zsh.org; iprev=pass (mail-oi1-f179.google.com) smtp.remote-ip=209.85.167.179; dkim=pass header.d=gmail.com header.s=20230601 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none Received: from mail-oi1-f179.google.com ([209.85.167.179]:56557) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1rI0Hb-000EXx-IS; Tue, 26 Dec 2023 05:47:17 +0000 Received: by mail-oi1-f179.google.com with SMTP id 5614622812f47-3bb7344a0e1so3486942b6e.0 for ; Mon, 25 Dec 2023 21:47:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703569632; x=1704174432; darn=zsh.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=cbbo0YrqAjKFW1st6C8uqlAuYFV6ndSXDyIZO4HWYj8=; b=WmFeoT/tyuC+b7NZn+oDqCbMKtt7YDGKjP2yfLOdYiLU2GnGxioqU2BcUGGH8D7LRr TLEyzdM6aInmnEUqeuwnVd7odI6s/wn7fxJCDkwZNgzTzrCzJfgNsr482UyFvg3kINnB WTUO2DsmJsd/VAWSDnicwyc5HMQ3PxKE2u5jSIZq6f54Zf6wuDxe45VQxPzefsG0R7ll mrMGzI/wlhoHe0+gADjaXQYPYKc12v8irzGJhp7W4MXnukuXebYgvbzc9g0Hqyw8dX8I rtRJsMuIg1/y+tlx54fbVIqr+D7iYDf2ivLaujZuY1TCn/3Vv7jMTRkWfYjNIsfCo+p5 1+JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703569632; x=1704174432; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=cbbo0YrqAjKFW1st6C8uqlAuYFV6ndSXDyIZO4HWYj8=; b=rB9xC3k7daYo+VOuSwVPQ6dIz+UDeN0QaB6/gtvWXPSLCl8oPrZG1EdyDRPFWPbmHD pnhNe5p2GKEU6agAD/c8Fh6L9/mgGll8jU3ytcRDDS1S+Lo/WBzUn8f7IxfRgKvIcZRu Wy79ZV6PDkmNBkvJIEekA3DI3YJWHY+/MtwAee5lxocnnbdW+nbprn6u8nKPUjFNRmPs JbcEeOs7C4cG4iG48ObiiLDPlb+RKrvw+/6Yx1Ky95kboUcFFiqNNgNMhsm+5X1DppaK P+Yk+oOBUm23fWko2FmWCq2BQIjNnva5l0dMWK68wdsTMpGOozyuw2NwYzQPO9RTe9hF No4g== X-Gm-Message-State: AOJu0Yzu1/bbrPgSvuendjPoOSd4vHjiQhAUEAhbEoWKo5Hq9ivK9to9 ZkpdyBkbK/YTVIeElVzF2cGVO+n6DI/Pkw== X-Google-Smtp-Source: AGHT+IFyecc8oXb/U5yQ6juZQ+y1a/3Qrz7E6TfQUmOr+RNWvHq5nZdLEr3r8lDEHVr0MykoTBihag== X-Received: by 2002:a05:6808:171b:b0:3b8:b1bd:b36a with SMTP id bc27-20020a056808171b00b003b8b1bdb36amr7115691oib.49.1703569631949; Mon, 25 Dec 2023 21:47:11 -0800 (PST) Received: from localhost.localdomain ([2001:448a:20a0:cc01:c8fd:1cb7:3a8e:cad7]) by smtp.gmail.com with ESMTPSA id m10-20020a170902db0a00b001d0b4693539sm9118522plx.189.2023.12.25.21.47.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Dec 2023 21:47:11 -0800 (PST) From: James Tirta Halim To: zsh-workers@zsh.org Cc: James Tirta Halim Subject: [PATCH] string.c: remove use of strcat() after strlen() Date: Tue, 26 Dec 2023 12:43:00 +0700 Message-ID: <20231226054300.166144-1-tirtajames45@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Seq: 52431 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: , List-Subscribe: , List-Unsubscribe: , List-Post: List-Owner: List-Archive: --- Src/string.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Src/string.c b/Src/string.c index 5f439926e..99e31d6c3 100644 --- a/Src/string.c +++ b/Src/string.c @@ -28,6 +28,8 @@ #include "zsh.mdh" +#define MEMPCPY(dst, src, n) ((char *)memcpy(dst, src, n) + n) + /**/ mod_export char * dupstring(const char *s) @@ -200,7 +202,10 @@ ztrduppfx(const char *s, int len) mod_export char * appstr(char *base, char const *append) { - return strcat(realloc(base, strlen(base) + strlen(append) + 1), append); + const size_t base_len = strlen(base); + const size_t append_len = strlen(append); + *(append = (char *)MEMPCPY((char *)realloc(base, base_len + append_len + 1) + base_len, append, append_len)) = '\0'; + return append; } /* Return a pointer to the last character of a string, -- 2.43.0