From nobody Tue Dec 26 17:48:21 2023 X-Original-To: dev-commits-src-main@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 4T02LZ1KP9z55DxG; Tue, 26 Dec 2023 17:48:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T02LY6jBfz4Znr; Tue, 26 Dec 2023 17:48:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612901; 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=DWD4QNfV1XjdMoBVNV5JWjUYJAICha6DrTna+jPkRa8=; b=cME8JTgHDgAQQ75qYtkYQOT+Isa0CSkjAQfEft4B41tGl/ygzoVpdixvGjeJkdUD5Jr3yh ULnkSrivyJoW69nc9WrcTCzissfDztSibA9bBP2jS1t2zcKdyup5pykrtI7glsOhEkBX9U VYv9IU+v2CzdM3KX86vdt3qyfkNGcBPvS87/L792Z4xT7qQsbXG+2EqOucJk8GcXkcRa4Q KajpioPOApZ5p9/lG6fBzkOLsyTH3AxVcmRBA9hDJVhA2r0/+mMUtyp6UBqNbcxDuBjH/y nx4l7yAV1JZeoME3e4eBhU6eKm6CueLnX4Djl4s84Laybev+Wtt8Eps8fFK65A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703612901; a=rsa-sha256; cv=none; b=fHNADR1KqrjKx4gWL5z3HFb+azZ30WYtFE5ym7/Tqz0RxH9uZDjMpGXrpQePwI6G2B7B4k vDTkaDtFNsQ+AwrjuywJmE+cGgRNWPxirmg0vCgiuq3NGDq2erbS87wPkvlGtofZV8ak0i g95v0f1mY2iMHmUwBBlW2KGgpFlFP7STbR29Fn6YeJnlHj+MmwDMATmGs9za25FH3FKjDl 470tWcwZmbCHITxPs5u2DMM1jRZLu2yV/iAw1DX9c9OAFnLMyWb3zPBVzccCdJRhdJjd+x ZE2GiCCYfB8hwGNCPx6voBPY1cZ2zUYG76c3KoJ4A0dlK46fiL8Et7dgDpf/Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703612901; 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=DWD4QNfV1XjdMoBVNV5JWjUYJAICha6DrTna+jPkRa8=; b=sNG0EA2q054EfAMzNMQS5mliiMjCDYpcqolrJ7n6HnvvIGpP67wXkkzd9VA7/awGx0WmoS yKyZPlXCaJ4rhTqs+cmKr3B3alz9LD7JFip3Jw6/szpbZpeubwmpH94NGJx08yiUTivmFg PLpZQr7FcXnEtTUWWR7UjxQBhumj9f7eCxVy6CZn1q0J7RsWdPcduaM8U4Pu8X/VVm5J5Y KCuKsYHPoE2kTrLGFhw02N637ZAUFgIFFlpNJ4QZoPKgruilNIGQ++hbTsEJ2MVtbXg2wQ 1v38F7kFTv2ELsU86XElyg/rjaex5aLmHESg9PdnPzh2X5r20eqTkGqlYQuokw== 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 4T02LY5pz5z142V; Tue, 26 Dec 2023 17:48:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQHmLNO080387; Tue, 26 Dec 2023 17:48:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQHmLLa080384; Tue, 26 Dec 2023 17:48:21 GMT (envelope-from git) Date: Tue, 26 Dec 2023 17:48:21 GMT Message-Id: <202312261748.3BQHmLLa080384@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8f0498208db6 - main - bhyve/audio.c: avoid re-calculating the length of dev_name List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f0498208db67786d4a60982c0e9ae42e8ebd26b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8f0498208db67786d4a60982c0e9ae42e8ebd26b commit 8f0498208db67786d4a60982c0e9ae42e8ebd26b Author: rilysh AuthorDate: 2023-12-26 16:24:04 +0000 Commit: Warner Losh CommitDate: 2023-12-26 16:36:31 +0000 bhyve/audio.c: avoid re-calculating the length of dev_name In the function audio_init(), strlen() is being called two times, first to get the length of dev_name and second to use in memcpy(). Creating a local variable and keeping the length avoids this re-calculation. Signed-off-by: rilysh Reviewed by: imp, zlei Pull Request: https://github.com/freebsd/freebsd-src/pull/945 --- usr.sbin/bhyve/audio.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/audio.c b/usr.sbin/bhyve/audio.c index fc9ded37044a..4613f3583116 100644 --- a/usr.sbin/bhyve/audio.c +++ b/usr.sbin/bhyve/audio.c @@ -80,6 +80,7 @@ audio_init(const char *dev_name, uint8_t dir) #endif }; #endif + size_t nlen; assert(dev_name); @@ -87,8 +88,9 @@ audio_init(const char *dev_name, uint8_t dir) if (!aud) return NULL; - if (strlen(dev_name) < sizeof(aud->dev_name)) - memcpy(aud->dev_name, dev_name, strlen(dev_name) + 1); + nlen = strlen(dev_name); + if (nlen < sizeof(aud->dev_name)) + memcpy(aud->dev_name, dev_name, nlen + 1); else { DPRINTF("dev_name too big"); free(aud);