[master] 8fd310af0 Explain things for Coverity

Poul-Henning Kamp phk at FreeBSD.org
Mon May 27 15:50:09 UTC 2019


commit 8fd310af0238a5ae3dbd1df417a2c6ac3931102e
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon May 27 15:49:17 2019 +0000

    Explain things for Coverity

diff --git a/lib/libvarnish/vsb.c b/lib/libvarnish/vsb.c
index f95debe0d..f0e26e2f4 100644
--- a/lib/libvarnish/vsb.c
+++ b/lib/libvarnish/vsb.c
@@ -636,6 +636,7 @@ VSB_tofile(int fd, const struct vsb *s)
 
 	assert_VSB_integrity(s);
 	assert_VSB_state(s, VSB_FINISHED);
-	sz = write(fd, VSB_data(s), VSB_len(s));
-	return (sz == VSB_len(s) ? 0 : -1);
+	assert(s->s_len >= 0);
+	sz = write(fd, s->s_buf, s->s_len);
+	return (sz == s->s_len ? 0 : -1);
 }
diff --git a/lib/libvarnish/vss.c b/lib/libvarnish/vss.c
index 4313b3b05..10281eee6 100644
--- a/lib/libvarnish/vss.c
+++ b/lib/libvarnish/vss.c
@@ -103,7 +103,7 @@ vss_resolve(const char *addr, const char *def_port, int family, int socktype,
     int flags, struct addrinfo **res, const char **errp)
 {
 	struct addrinfo hints;
-	char *p = NULL, *hp, *pp;
+	char *p, *hp, *pp;
 	int ret;
 
 	AN(addr);


More information about the varnish-commit mailing list