More asserts

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2092 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache_center.c b/varnish-cache/bin/varnishd/cache_center.c
index 3462555a14730b0b35a506940939377546be1f22..772ddc6c152a48029f29cfb82c8f61972cab1bec 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_center.c
+++ b/varnish-cache/bin/varnishd/cache_center.c
@@ -789,6 +789,7 @@ CNT_Session(struct sess *sp)
        CHECK_OBJ_NOTNULL(w, WORKER_MAGIC);
 
        for (done = 0; !done; ) {
+               assert(sp->wrk == w);
                /*
                 * This is a good place to be paranoid about the various
                 * pointers still pointing to the things we expect.

diff --git a/varnish-cache/bin/varnishd/cache_httpconn.c b/varnish-cache/bin/varnishd/cache_httpconn.c
index ce6d8af44c58503842ff82563db9b551db4ecdd0..8ed70c9f15faa23310b7cd14d94969c7248a43b7 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_httpconn.c
+++ b/varnish-cache/bin/varnishd/cache_httpconn.c
@@ -138,6 +138,7 @@ HTC_Rx(struct http_conn *htc)
        int i;
 
        CHECK_OBJ_NOTNULL(htc, HTTP_CONN_MAGIC);
+       AN(htc->ws->r);
        i = (htc->ws->r - htc->rxbuf.e) - 1;    /* space for NUL */
        if (i <= 0) {
                WS_ReleaseP(htc->ws, htc->rxbuf.b);