From nobody Fri May 3 00:26:07 2024 X-Original-To: dev-commits-src-branches@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 4VVs6S23l0z5KKxf; Fri, 3 May 2024 00:26:08 +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 4VVs6S08Z5z4f9x; Fri, 3 May 2024 00:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714695968; 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=f4sdZ0wHWeKgu+847qW00l7m1tmuU1+/fir5SfXb+sc=; b=yLajQgkDMcqWeAGc9eO2dWzFwlbmmVW0JdBkOepvhMYHbBzuAJ1Sd6siOvkMAVFnTav80p tjTF+PakTWxHncCjw9waluqIy+BHNaPnM5pgH8IMUYiCZzA9MH0887KPz7AeUJei6hJSm5 tsvZ2VWW6c2EM1RhHNfh9CNJOiK1mFMnTfXA08NUhhw20tQCZ9K6Iez1+feSOQB/cZ5/pA 6FJ4NLNIR0DBI5yOUSB7YYDOirmRan67SUgBi5ds8sDLlhfeWWK9IfLTupe93RG02NmWjr 6EwmNG6GA8mjpyhS4yPS55vka2Qaed32AtBCy5HkjAmbBPNYAtiimaw5pFVbvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714695968; a=rsa-sha256; cv=none; b=egihpsBx3Pb3xatX786FUQqnV47lNYjIbjLIGxMc/svCcTK/vKHae5dxJHn9BB6IASUNHQ xsu6t+Yi/gOXhmPSMEEbAMGo8HFPo6tE8LZXmECK4cDipsuBgFopXgw7jc9T+9Yq224X/U 43PQXGB/CYCeCCGfmhqIj72EZKugYidi+D3SAKDR3/6CCAnn7fXgMK5bY/BO0YbS73HnAS 8BUvah1LezlSH8ldkcFCD88Ulnuk3OfQ4akAA7A6n9DaqoXZ8AC8hAFNPrCobDkHtybxXk +8WaKt06eCbzYxKQMCLHz90tqy2cOc/toTVWVZC70IHjVbpZ1yoQ5VSA8In/oA== 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=1714695968; 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=f4sdZ0wHWeKgu+847qW00l7m1tmuU1+/fir5SfXb+sc=; b=U0pfUTEqle5N9kbIRO7fri5WhPRg+qQ02Cv2ZkRHu+37IZK7n+ygAHW9q0W+6eulAmxe9l F7p5IJq1CcHnbxUrK+BSF2xoNq63Dg55I//R+SMzB7n3ragbAnF2QlBZ13GNWx6CzUnDEN pLMLis0Us5V+2Dd+yJWDq1fCHmo3bjOHQfkcdo7KOdHbOXWBj9qdjpKluU61q67T71C15S 8yGXpirkDcKvpeoWaDSkQf76gj+DMG0MwHnR2o6PDIxnaQqjzdVl2sME2OdMg5ydfr/gBj MqRfA29w2oXtQrSYgsmibjqWVS0aJT9j+9gcXKXMx7ENLjOaVrAHd7GWl3TUEg== 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 4VVs6R6s6NzPHQ; Fri, 3 May 2024 00:26:07 +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 4430Q7OZ097501; Fri, 3 May 2024 00:26:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4430Q72T097498; Fri, 3 May 2024 00:26:07 GMT (envelope-from git) Date: Fri, 3 May 2024 00:26:07 GMT Message-Id: <202405030026.4430Q72T097498@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 44debee9fc1f - stable/14 - rtld snprintf: do not erronously skip a char at the buffer boundary List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 44debee9fc1fc795b928f75b5d894c3212d73893 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=44debee9fc1fc795b928f75b5d894c3212d73893 commit 44debee9fc1fc795b928f75b5d894c3212d73893 Author: Konstantin Belousov AuthorDate: 2024-04-28 06:37:24 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-03 00:25:33 +0000 rtld snprintf: do not erronously skip a char at the buffer boundary (cherry picked from commit 56ee5fc43c40479e2651b21862e299bcf73017ae) --- libexec/rtld-elf/rtld_printf.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libexec/rtld-elf/rtld_printf.c b/libexec/rtld-elf/rtld_printf.c index 07598c73c6d4..befac1c547b7 100644 --- a/libexec/rtld-elf/rtld_printf.c +++ b/libexec/rtld-elf/rtld_printf.c @@ -81,11 +81,10 @@ snprintf_func(int ch, struct snprintf_arg *const info) } break; case PRINT_METHOD_WRITE: - if (info->remain > 0) { - *info->str++ = ch; - info->remain--; - } else + if (info->remain == 0) printf_out(info); + *info->str++ = ch; + info->remain--; break; } }