From f69b700df7b6b473826639377fbb0ea569e5b2cc Mon Sep 17 00:00:00 2001 From: claudio Date: Tue, 20 Jun 2023 09:54:57 +0000 Subject: [PATCH] Replace a ibuf_reserve() dance to add a NUL byte with ibuf_add_zero(buf, 1). Same thing but far less nasty. OK tb@ --- usr.sbin/relayd/check_tcp.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/usr.sbin/relayd/check_tcp.c b/usr.sbin/relayd/check_tcp.c index 6ab69526500..096020336bb 100644 --- a/usr.sbin/relayd/check_tcp.c +++ b/usr.sbin/relayd/check_tcp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: check_tcp.c,v 1.58 2021/09/18 19:44:46 claudio Exp $ */ +/* $OpenBSD: check_tcp.c,v 1.59 2023/06/20 09:54:57 claudio Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard @@ -344,17 +344,14 @@ check_http_code(struct ctl_tcp_event *cte) char *head; char scode[4]; const char *estr; - u_char *b; int code; struct host *host; /* * ensure string is nul-terminated. */ - b = ibuf_reserve(cte->buf, 1); - if (b == NULL) + if (ibuf_add_zero(cte->buf, 1) == -1) fatal("out of memory"); - *b = '\0'; head = cte->buf->buf; host = cte->host; @@ -398,17 +395,14 @@ int check_http_digest(struct ctl_tcp_event *cte) { char *head; - u_char *b; char digest[SHA1_DIGEST_STRING_LENGTH]; struct host *host; /* * ensure string is nul-terminated. */ - b = ibuf_reserve(cte->buf, 1); - if (b == NULL) + if (ibuf_add_zero(cte->buf, 1) == -1) fatal("out of memory"); - *b = '\0'; head = cte->buf->buf; host = cte->host; -- 2.20.1