[master] 336f2eb Correctly account for the entire terminator space needed when checking vary length

Martin Blix Grydeland martin at varnish-software.com
Wed Jan 21 16:23:20 CET 2015


commit 336f2eb8fe1c8f46dbf32a9bad387171eee69c85
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Wed Jan 21 16:03:25 2015 +0100

    Correctly account for the entire terminator space needed when checking
    vary length

diff --git a/bin/varnishd/cache/cache_vary.c b/bin/varnishd/cache/cache_vary.c
index 492af99..8424223 100644
--- a/bin/varnishd/cache/cache_vary.c
+++ b/bin/varnishd/cache/cache_vary.c
@@ -321,7 +321,7 @@ VRY_Match(struct req *req, const uint8_t *vary)
 				lh = 0xffff;
 			}
 
-			if (vsp + ln + 2 >= req->vary_e) {
+			if (vsp + ln + 3 >= req->vary_e) {
 				/*
 				 * Not enough space to build new entry
 				 * and put terminator behind it.



More information about the varnish-commit mailing list