[6.0] 87a7dfdf9 Polish
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Thu Aug 16 08:52:43 UTC 2018
commit 87a7dfdf9d20383ebb31c301d8d65aff6c4a937b
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date: Sat Apr 14 08:56:56 2018 +0100
Polish
diff --git a/bin/varnishd/mgt/mgt_child.c b/bin/varnishd/mgt/mgt_child.c
index 981c5bfea..7a427d5bf 100644
--- a/bin/varnishd/mgt/mgt_child.c
+++ b/bin/varnishd/mgt/mgt_child.c
@@ -462,8 +462,8 @@ mgt_reap_child(void)
if (ev_poker != NULL) {
VEV_Stop(mgt_evb, ev_poker);
free(ev_poker);
+ ev_poker = NULL;
}
- ev_poker = NULL;
/* Stop the listener */
if (ev_listen != NULL) {
diff --git a/bin/varnishtest/vtc_http2.c b/bin/varnishtest/vtc_http2.c
index 2c458f3d6..b8857b3bb 100644
--- a/bin/varnishtest/vtc_http2.c
+++ b/bin/varnishtest/vtc_http2.c
@@ -293,8 +293,7 @@ clean_frame(struct frame **f)
if ((*f)->type == TYPE_GOAWAY)
free((*f)->md.goaway.debug);
free((*f)->data);
- free(*f);
- *f = NULL;
+ FREE_OBJ(*f);
}
static void
diff --git a/bin/varnishtest/vtc_process.c b/bin/varnishtest/vtc_process.c
index b05d0ce28..44103f42b 100644
--- a/bin/varnishtest/vtc_process.c
+++ b/bin/varnishtest/vtc_process.c
@@ -396,16 +396,16 @@ process_delete(struct process *p)
free(p->out);
free(p->err);
+ for (i = 0; i < p->nlin; i++)
+ free(p->vram[i]);
+ free(p->vram);
+
/*
* We do not delete the directory, it may contain useful stdout
* and stderr files. They will be deleted on account of belonging
* to the test's tmpdir.
*/
- for (i = 0; i < p->nlin; i++)
- free(p->vram[i]);
- free(p->vram);
-
/* XXX: MEMLEAK (?) */
FREE_OBJ(p);
}
More information about the varnish-commit
mailing list