[master] b59bf49 Alignment may push the size up

Poul-Henning Kamp phk at FreeBSD.org
Sun May 17 11:40:04 CEST 2015


commit b59bf492538a496f7822cca466bfb7f9f85cfee2
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun May 17 09:30:55 2015 +0000

    Alignment may push the size up

diff --git a/bin/varnishd/cache/cache_pool.c b/bin/varnishd/cache/cache_pool.c
index 36668c1..4bec380 100644
--- a/bin/varnishd/cache/cache_pool.c
+++ b/bin/varnishd/cache/cache_pool.c
@@ -202,7 +202,7 @@ Pool_Task_Arg(struct worker *wrk, task_func_t *func,
 	Lck_Unlock(&pp->mtx);
 	AZ(wrk2->task.func);
 
-	assert(arg_len == WS_Reserve(wrk2->aws, arg_len));
+	assert(arg_len <= WS_Reserve(wrk2->aws, arg_len));
 	memcpy(wrk2->aws->f, arg, arg_len);
 	wrk2->task.func = func;
 	wrk2->task.priv = wrk2->aws->f;



More information about the varnish-commit mailing list