Don't crash on set object finalization if the constructor failed.

d055f0f9 · Geoff Simmons · b11bcf94 · d055f0f9
Commit d055f0f9 authored Jun 03, 2017 by Geoff Simmons
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

vmod_re2.c src/vmod_re2.c +3 -1

No files found.
--- a/src/vmod_re2.c
+++ b/src/vmod_re2.c
@@ -577,9 +577,11 @@ vmod_set__fini(struct vmod_re2_set **setp)
 {
 	struct vmod_re2_set *set;

+	if (setp == NULL || *setp == NULL)
+		return;
+	CHECK_OBJ(*setp, VMOD_RE2_SET_MAGIC);
 	set = *setp;
 	*setp = NULL;
-	CHECK_OBJ_NOTNULL(set, VMOD_RE2_SET_MAGIC);
 	vre2set_fini(&set->set);
 	if (set->vcl_name != NULL)
 		free(set->vcl_name);