Don't crash on regex object finalization if the contructor failed.

dfc4d477 · Geoff Simmons · 82f84eaa · dfc4d477
Commit dfc4d477 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
@@ -338,9 +338,11 @@ vmod_regex__fini(struct vmod_re2_regex **rep)
 {
 	struct vmod_re2_regex *re;

+	if (rep == NULL || *rep == NULL)
+		return;
+	CHECK_OBJ(*rep, VMOD_RE2_REGEX_MAGIC);
 	re = *rep;
 	*rep = NULL;
-	CHECK_OBJ_NOTNULL(re, VMOD_RE2_REGEX_MAGIC);
 	vre2_fini(&re->vre2);
 	if (re->vcl_name != NULL)
 		free(re->vcl_name);