[master] deb830f Plug a harmless heap use-after-free

[Federico G. Schwindt]

commit deb830fbe6faf314a02908694a1e3d16070dc0fa
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Tue Apr 25 07:20:39 2017 -0700

    Plug a harmless heap use-after-free

diff --git a/bin/varnishd/common/heritage.h b/bin/varnishd/common/heritage.h
index b7bca53..5d6a8af 100644
--- a/bin/varnishd/common/heritage.h
+++ b/bin/varnishd/common/heritage.h
@@ -48,7 +48,6 @@ struct listen_sock {
 	VTAILQ_ENTRY(listen_sock)	list;
 	VTAILQ_ENTRY(listen_sock)	arglist;
 	int				sock;
-	const struct listen_arg		*arg;
 	char				*name;
 	struct suckaddr			*addr;
 	const struct transport		*transport;
diff --git a/bin/varnishd/mgt/mgt_acceptor.c b/bin/varnishd/mgt/mgt_acceptor.c
index 3b0985f..f9926f4 100644
--- a/bin/varnishd/mgt/mgt_acceptor.c
+++ b/bin/varnishd/mgt/mgt_acceptor.c
@@ -114,11 +114,10 @@ mac_callback(void *priv, const struct suckaddr *sa)
 	VTAILQ_FOREACH(ls, &heritage.socks, list) {
 		if (!VSA_Compare(sa, ls->addr))
 			ARGV_ERR("-a arguments %s and %s have same address\n",
-			    ls->arg->name, la->name);
+			    ls->name, la->name);
 	}
 	ALLOC_OBJ(ls, LISTEN_SOCK_MAGIC);
 	AN(ls);
-	ls->arg = la;
 	ls->sock = -1;
 	ls->addr = VSA_Clone(sa);
 	AN(ls->addr);