Bladeren bron

core: link regex before replacement field allocation can fail

- regex will be freed properly if there was an error for replacement
Daniel-Constantin Mierla 11 jaren geleden
bovenliggende
commit
511de7f5dc
1 gewijzigde bestanden met toevoegingen van 1 en 1 verwijderingen
  1. 1 1
      re.c

+ 1 - 1
re.c

@@ -310,6 +310,7 @@ found_re:
 		goto error;
 	}
 	memset((void*)se, 0, sizeof(struct subst_expr));
+	se->re=regex;
 	se->replacement.len=repl_end-repl;
 	if (se->replacement.len > 0) {
 		if ((se->replacement.s=pkg_malloc(se->replacement.len))==0){
@@ -321,7 +322,6 @@ found_re:
 	} else {
 		se->replacement.s = NULL;
 	}
-	se->re=regex;
 	se->replace_all=replace_all;
 	se->n_escapes=rw_no;
 	se->max_pmatch=max_pmatch;