From nobody Thu Feb 13 17:51:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yv2mm1FNkz5n3ZX; Thu, 13 Feb 2025 17:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yv2mm03zXz3w15; Thu, 13 Feb 2025 17:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739469096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PH8qgt8tuQH2NcFC+u/eAKsir22r0E24qJK4TECu/xU=; b=ecTGG3ktMcg6ZDPH12yMFuWBFUS11LbsKhUIFahIOpK8nxumRg1jbL9G4QPfm/rPEFDo95 eF4wP2lBd81VEePDHTOIPMddQP4jLc9HvWHUEAE7uuzdFK9ety8ZXNaFvwxPnI38kCC8p+ Hf27gUYb4u40cO33W1aRsLOMjC69ipQMGWrGkOAbnCrBC78ey7ZHIw4C+G0rEvTkiNvq+q eJHhNqBXELboEneCq85FFJiWBUP5X0PzhYgjGWDJHh8100XMW7v3lWiobTuCmAy4WeyWlg UvL35usYOX531v1ZaI1PIYzeDNWZgzkf6cqBMu407/DJim6MEpZoZzilK1rZdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739469096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PH8qgt8tuQH2NcFC+u/eAKsir22r0E24qJK4TECu/xU=; b=ZhP3qg8vfLKUueIUNC70ENdj405GW+G52Srg0SOuULx/GE2Qa/xE01FRkRH+KlcRZHfKB2 4o9rCAcxrWBxhbJv61PfwMdkMrAqzFv5V3TDi5XJt5CXuJin0WYw+KvIkhvtwhwvmxXW1/ ZRaIa/ybkiK+rWTdwNummsOrwumnGgLZedymp6HZDRRedGcGYdAp/JaQc+MvOOGfOX7R9Q UOE2IJ4fRulwlvwqKBy22vlw3J2ofVFDDOg787HOE6ixfb7L4e9g2oX23R+s2buX3Ejy4B krbjuZ3cfqlgp8NTBuJxN9ggRebKk1TdvHmAbHCM2KZW804zirGtpDushMkMQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739469096; a=rsa-sha256; cv=none; b=vxJOZRXK9+3iSIHUVsVk4RVWLQLql4NRzA1Xa5iD1446cfBRspYB6zodiIuB141hphR0xD mdWThVtXAiqZLaSg0LSvnTmyQeVucL7HRTazcnaDkm7p02LEqGuDLZJQjRZs6S/24HgEX3 n8bdRbYBjAPktbn3RHhv+/X8soFxj+yVfXgl/ytS7KGOn6Flkzfs/06EYT/AFPcpsJJVGz SNt65+trOsQn07hhtTbcNlNT5efDvzEsRzhSYDcVlsF/MJRQKFmloPOFSHknqh3Ho78/r1 tQSUec9rzwM7xOJai4EWsPk510vN9Ys0l9RCs6uwz+wmbe9Wmv+hgv4ffXSOeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yv2ml6g3KzvkV; Thu, 13 Feb 2025 17:51:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51DHpZUZ069377; Thu, 13 Feb 2025 17:51:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51DHpZeF069374; Thu, 13 Feb 2025 17:51:35 GMT (envelope-from git) Date: Thu, 13 Feb 2025 17:51:35 GMT Message-Id: <202502131751.51DHpZeF069374@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 74a5a7d84236 - stable/13 - pac: Use strdup and asprintf in place of dubious string building List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 74a5a7d842367f239c7d6f628c3a97f9a467ed84 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=74a5a7d842367f239c7d6f628c3a97f9a467ed84 commit 74a5a7d842367f239c7d6f628c3a97f9a467ed84 Author: John Baldwin AuthorDate: 2025-01-03 15:39:44 +0000 Commit: John Baldwin CommitDate: 2025-02-13 17:49:02 +0000 pac: Use strdup and asprintf in place of dubious string building GCC 14 warned about transposed arguments to calloc, but these cases are better served by more abstract string functions. (cherry picked from commit f94513a3a36b50823c3918c93ee5c6bf5f525e91) --- usr.sbin/lpr/pac/pac.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c index 85c9327f433f..5eb5cab02353 100644 --- a/usr.sbin/lpr/pac/pac.c +++ b/usr.sbin/lpr/pac/pac.c @@ -339,8 +339,7 @@ enter(const char name[]) h = hash(name); hcount++; hp = (struct hent *) calloc(sizeof *hp, (size_t)1); - hp->h_name = (char *) calloc(sizeof(char), strlen(name)+1); - strcpy(hp->h_name, name); + hp->h_name = strdup(name); hp->h_feetpages = 0.0; hp->h_count = 0; hp->h_link = hashtab[h]; @@ -441,10 +440,8 @@ chkprinter(const char *ptrname) errx(3, "accounting not enabled for printer %s", ptrname); if (!pflag && pp->price100) price = pp->price100/10000.0; - sumfile = (char *) calloc(sizeof(char), strlen(acctfile)+5); + asprintf(&sumfile, "%s_sum", acctfile); if (sumfile == NULL) - errx(1, "calloc failed"); - strcpy(sumfile, acctfile); - strcat(sumfile, "_sum"); + errx(1, "asprintf failed"); return(1); }