git: d9ec850bde3c - stable/13 - rtld snprintf: do not erronously skip a char at the buffer boundary

From: Konstantin Belousov <kib_at_FreeBSD.org>
Date: Fri, 03 May 2024 00:26:46 UTC
The branch stable/13 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=d9ec850bde3c8695bebfdfeea72deb1d060cd183

commit d9ec850bde3c8695bebfdfeea72deb1d060cd183
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-04-28 06:37:24 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
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;
 	}
 }