[master] 796adf9 More asserting on sp->fd
Poul-Henning Kamp
phk at FreeBSD.org
Mon Jan 30 12:30:05 CET 2017
commit 796adf96e217f2cb5b64aa1bb5bef8ded8194b88
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Mon Jan 30 11:29:13 2017 +0000
More asserting on sp->fd
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 82933ab..dc671ea 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -434,6 +434,7 @@ SES_Wait(struct sess *sp, const struct transport *xp)
CHECK_OBJ_NOTNULL(xp, TRANSPORT_MAGIC);
pp = sp->pool;
CHECK_OBJ_NOTNULL(pp, POOL_MAGIC);
+ assert(sp->fd > 0);
/*
* XXX: waiter_epoll prevents us from zeroing the struct because
* XXX: it keeps state across calls.
@@ -503,7 +504,7 @@ SES_Close(struct sess *sp, enum sess_close reason)
int i;
assert(reason > 0);
- assert(sp->fd >= 0);
+ assert(sp->fd > 0);
i = close(sp->fd);
assert(i == 0 || errno != EBADF); /* XXX EINVAL seen */
sp->fd = -(int)reason;
More information about the varnish-commit
mailing list