summaryrefslogtreecommitdiff
path: root/lib/printf/glue.c
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas@opensourcerouting.org>2023-05-23 09:44:13 +0300
committerGitHub <noreply@github.com>2023-05-23 09:44:13 +0300
commitb8b30c765b5a2a446bac261f7c3dee88deee50e5 (patch)
treeed15cfdc6e38bcd6455dc808ae8fa5167da7e24e /lib/printf/glue.c
parent4d7f6295c6487b438d50280c1d7ddfe490d4749c (diff)
parentd9dfbab71c8f508c9d90cd90228a18bb60ea43b9 (diff)
Merge pull request #13570 from donaldsharp/toooooooo_fast
Grab bag of fixes from upgrading system
Diffstat (limited to 'lib/printf/glue.c')
-rw-r--r--lib/printf/glue.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/printf/glue.c b/lib/printf/glue.c
index 25e2ff37a3..f799378af3 100644
--- a/lib/printf/glue.c
+++ b/lib/printf/glue.c
@@ -273,6 +273,7 @@ static ssize_t printfrr_va(struct fbuf *buf, struct printfrr_eargs *ea,
{
const struct va_format *vaf = ptr;
va_list ap;
+ ssize_t s;
if (!vaf || !vaf->fmt || !vaf->va)
return bputs(buf, "NULL");
@@ -285,6 +286,9 @@ static ssize_t printfrr_va(struct fbuf *buf, struct printfrr_eargs *ea,
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
/* can't format check this */
- return vbprintfrr(buf, vaf->fmt, ap);
+ s = vbprintfrr(buf, vaf->fmt, ap);
#pragma GCC diagnostic pop
+ va_end(ap);
+
+ return s;
}