From nobody Fri May 3 00:26:46 2024 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 4VVs7B6Klsz5KKcm; Fri, 3 May 2024 00:26:46 +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 4VVs7B30trz4g91; Fri, 3 May 2024 00:26:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714696006; 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=LjRO6hlEb13mvPWc+FLLTILqK7/y0zkjtd8Ge1YTUuw=; b=Q4TPeK8jUthcNWIPJTYWo1CqGJp/Oc+8aI24WfFl6UVQ6062vGjGG/IzpE3ZxV4fFpfApZ IpcnajJK9r0uduSadrbQlDgrjk+yC7/xLH7bB2IQYG8yHBCmCOEVQOezVfEAsCJ31DbeJO LuQQkoyRDk0VtkEWiIma5u4EnYzolDtC/DTmfrTEm7/21JT0wg266cBYAsedaFQtUXfWx3 IgiTqjKsnDK9PE5NMZViDb8a/6me9pUipCzXGlrQlKEUEkuwIzgrEATU/QpEZOW8TFDqOl +pLdrX2bd9XRf3XkOhPGeHNkHdJL/urqjns4BSflbraWQiCpkxbAKsDauqRYtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714696006; a=rsa-sha256; cv=none; b=Dns97O1kFwfL4MZdgyOxIhRlQAQl2/Hx1B4KfSgur2sbrJSY5Xe+RX8PsG/rRILmkoKOsU rCKgXOqfZ9bNKUVTq56NCTomCQPSTF8L95m6/TZLkWR/OVC1Zlore3aArU27qHvsG8Pat7 gW6GrtudQfJSXW95gva506qGkYgxvKIRTqzxA7kXD7CrHkGWuOdUlNUth74zklxo5kj/Xu tpZeenRWujUgSIMh3BqmiSqznF9OLNovHSu6cOJWmxWNSYswebeEy/E7DZD5dgPciHF/Zh XE8wGLCXRBYLEDK7wBRLCtm3azgBQWjIzcl3CbMRSbVX9Plz/RCly8i056XzFg== 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=1714696006; 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=LjRO6hlEb13mvPWc+FLLTILqK7/y0zkjtd8Ge1YTUuw=; b=WDcRApd5P7wiPu6sx9U58P9MBaWLjnQn7WRVoRCEXOg3W4+X/xXxAG5mGvpNeFzt9L+HAe DJQP6mZeN1I4LoMLWF+ERYm05J4EfRCBWqVm6CbkdXW9K6gu3IZYo60fQHe3rLk9jgKh3d NzyRIx63D6zNoRX5DGXcKYJF7KJSJqooQr0ltc1il4i2xuHA6k2TCwWj/GkgtpXV/D8ALC nh0Yw7qIxcxvQywqpHIlXJipOMDbRo19DIVX/ctIctjavh1INKX5+X61klBnpVZnzOYLh9 Mli/iNZWk5/MhD5DNLgpEJRjzaWz3tM1/rRSNN5cQERRGVrkzgTFR3tMa/mevw== 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 4VVs7B2bFXzPHR; Fri, 3 May 2024 00:26:46 +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 4430QkFe097857; Fri, 3 May 2024 00:26:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4430Qkxk097854; Fri, 3 May 2024 00:26:46 GMT (envelope-from git) Date: Fri, 3 May 2024 00:26:46 GMT Message-Id: <202405030026.4430Qkxk097854@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: d9ec850bde3c - stable/13 - rtld snprintf: do not erronously skip a char at the buffer boundary 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d9ec850bde3c8695bebfdfeea72deb1d060cd183 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d9ec850bde3c8695bebfdfeea72deb1d060cd183 commit d9ec850bde3c8695bebfdfeea72deb1d060cd183 Author: Konstantin Belousov AuthorDate: 2024-04-28 06:37:24 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-03 00:26:26 +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; } }