diff options
| author |   martijn <martijn@openbsd.org> | 2020-09-15 09:23:22 +0000 |
|---|---|---|
| committer | martijn <martijn@openbsd.org> | 2020-09-15 09:23:22 +0000 |
| commit | cc1b8aca2190fe275b4088a918114fda547d0e7e (patch) | |
| tree | 77712449f2de6712d807f648d9567d1959e96d30 | |
| parent | we no longer need isc_netaddr_t (diff) | |
| download | wireguard-openbsd-cc1b8aca2190fe275b4088a918114fda547d0e7e.tar.xz wireguard-openbsd-cc1b8aca2190fe275b4088a918114fda547d0e7e.zip | |
Fix a dead store and a wrong-level NULL-check.
Found the static analyzer from tb@
OK beck@
| -rw-r--r-- | usr.sbin/relayd/agentx.c | 1 | ||||
| -rw-r--r-- | usr.sbin/relayd/subagentx.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/usr.sbin/relayd/agentx.c b/usr.sbin/relayd/agentx.c index 4ab852f8bfd..57638ae648e 100644 --- a/usr.sbin/relayd/agentx.c +++ b/usr.sbin/relayd/agentx.c @@ -135,7 +135,6 @@ agentx_recv(struct agentx *ax) header.aph_packetid = agentx_pdutoh32(&header, u8); u8 += 4; header.aph_plength = agentx_pdutoh32(&header, u8); - u8 += 4; if (header.aph_version != 1) { errno = EPROTO; diff --git a/usr.sbin/relayd/subagentx.c b/usr.sbin/relayd/subagentx.c index 335eab2fb4f..c654d29a43a 100644 --- a/usr.sbin/relayd/subagentx.c +++ b/usr.sbin/relayd/subagentx.c @@ -3833,7 +3833,7 @@ subagentx_strcat(char **dst, const char *src) } srclen = strlen(src); - if (dst == NULL || dstlen + srclen > buflen) { + if (*dst == NULL || dstlen + srclen > buflen) { nbuflen = (((dstlen + srclen) / 512) + 1) * 512; tmp = recallocarray(*dst, buflen, nbuflen, sizeof(*tmp)); if (tmp == NULL) |