Commit Diff

Commit:
0e00e8f4e2c00df4d65d269af5e978d35f46fc02
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
plug memory leaks on error in gw_briefs()
Actions:
Patch | Tree
commit - 18da997892569f062e33d862f756b1fe9ce070f2
commit + 0e00e8f4e2c00df4d65d269af5e978d35f46fc02
blob - 74afd10ed4ab87698c8c2738d9afe6326cfaa6fb
blob + 624d8496501e2f3bc921748a3c9b63590084c191
--- gotweb/gotweb.c
+++ gotweb/gotweb.c
@@ -646,36 +646,43 @@ gw_briefs(struct gw_trans *gw_trans)
 	else
 		error = gw_get_header(gw_trans, header,
 		    gw_trans->gw_conf->got_max_commits_display);
-
 	if (error)
-		return error;
+		goto done;
 
 	kerr = khttp_puts(gw_trans->gw_req, briefs_wrapper);
-	if (kerr != KCGI_OK)
-		return gw_kcgi_error(kerr);
+	if (kerr != KCGI_OK) {
+		error = gw_kcgi_error(kerr);
+		goto done;
+	}
 
 	TAILQ_FOREACH(n_header, &gw_trans->gw_headers, entry) {
 		if ((asprintf(&briefs_navs_html, briefs_navs,
 		    gw_trans->repo_name, n_header->commit_id,
 		    gw_trans->repo_name, n_header->commit_id,
-		    gw_trans->repo_name, n_header->commit_id)) == -1)
-			return got_error_from_errno("asprintf");
+		    gw_trans->repo_name, n_header->commit_id)) == -1) {
+			error = got_error_from_errno("asprintf");
+			goto done;
+		}
 		newline = strchr(n_header->commit_msg, '\n');
 		if (newline)
 			*newline = '\0';
 		if ((asprintf(&briefs_html, briefs_line,
 		    gw_get_time_str(n_header->committer_time, TM_DIFF),
 		    n_header->author, gw_html_escape(n_header->commit_msg),
-		    briefs_navs_html)) == -1)
-			return got_error_from_errno("asprintf");
+		    briefs_navs_html)) == -1) {
+			error = got_error_from_errno("asprintf");
+			goto done;
+		}
 		kerr = khttp_puts(gw_trans->gw_req, briefs_html);
-		if (kerr != KCGI_OK)
-			return gw_kcgi_error(kerr);
+		if (kerr != KCGI_OK) {
+			error = gw_kcgi_error(kerr);
+			goto done;
+		}
 	}
 	kerr = khttp_puts(gw_trans->gw_req, div_end);
 	if (kerr != KCGI_OK)
 		error = gw_kcgi_error(kerr);
-
+done:
 	got_ref_list_free(&header->refs);
 	gw_free_headers(header);
 	TAILQ_FOREACH(n_header, &gw_trans->gw_headers, entry)