[6.0] e54ea1bd1 fix lost workspace overflow markers

[Dridi Boukelmoune]

commit e54ea1bd1da08fde202996211a30d19bf42010cb
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Fri Apr 20 14:10:32 2018 +0200

    fix lost workspace overflow markers
    
    As WS_Reset() clears the overflow marker, the correct order for
    resetting and marking an overflow is WS_Reset(); WS_MarkOverflow();
    
    Fixes the last seemingly obscure bit of #2645

diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index 86df664b2..76b4c89f9 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -411,8 +411,8 @@ VRT_l_beresp_storage_hint(VRT_CTX, const char *str, ...)
 
 	if (p == NULL) {
 		VSLb(ctx->vsl, SLT_LostHeader, "storage_hint");
-		WS_MarkOverflow(ctx->ws);
 		WS_Reset(ctx->ws, sn);
+		WS_MarkOverflow(ctx->ws);
 		return;
 	}
 
diff --git a/lib/libvmod_std/vmod_std.c b/lib/libvmod_std/vmod_std.c
index fdf12276f..865199372 100644
--- a/lib/libvmod_std/vmod_std.c
+++ b/lib/libvmod_std/vmod_std.c
@@ -154,8 +154,8 @@ vmod_log(VRT_CTX, const char *fmt, ...)
 	va_end(ap);
 
 	if (p == NULL) {
-		WS_MarkOverflow(ctx->ws);
 		WS_Reset(ctx->ws, sn);
+		WS_MarkOverflow(ctx->ws);
 		return;
 	}