[master] a7e8a2600 vtc_server: Fix -Wclobbered variable during dispatch
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Mon Nov 28 13:51:05 UTC 2022
commit a7e8a2600d2b89e929522b3f7ecaf69bb1a3fae7
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date: Mon Nov 28 14:46:57 2022 +0100
vtc_server: Fix -Wclobbered variable during dispatch
Spotted by GCC's fortification level 3.
diff --git a/bin/varnishtest/tests/a00023.vtc b/bin/varnishtest/tests/a00023.vtc
new file mode 100644
index 000000000..b35a9ec7e
--- /dev/null
+++ b/bin/varnishtest/tests/a00023.vtc
@@ -0,0 +1,29 @@
+varnishtest "Run server -dispatch more than once"
+
+feature ignore_unknown_macro
+
+shell {
+ cat <<-'EOF' >_.vtc
+ varnishtest "Run server -dispatch more than once (nested)"
+
+ server s0 {
+ rxreq
+ txresp
+ } -dispatch
+
+ client c1 -connect ${s0_sock} {
+ txreq
+ rxresp
+ } -run
+
+ server s0 -break
+ server s0 -dispatch
+
+ client c1 -run
+ EOF
+
+ varnishtest -v _.vtc >_.log
+}
+
+shell -match "s1 +rxhdr" { cat _.log }
+shell -match "s2 +rxhdr" { cat _.log }
diff --git a/bin/varnishtest/vtc_server.c b/bin/varnishtest/vtc_server.c
index 08103a600..f09131a24 100644
--- a/bin/varnishtest/vtc_server.c
+++ b/bin/varnishtest/vtc_server.c
@@ -336,7 +336,8 @@ static void *
server_dispatch_thread(void *priv)
{
struct server *s, *s2;
- int sn = 1, fd;
+ static int sn = 1;
+ int fd;
char snbuf[8];
struct vtclog *vl;
struct sockaddr_storage addr_s;
More information about the varnish-commit
mailing list