Commit eb89db648e0a82e2d370c28a8725f8b57fd437de
2020-02-03T16:35:07
avoid leaking memory in gw_get_site_link()
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
diff --git a/gotweb/gotweb.c b/gotweb/gotweb.c
index bca3718..18265a7 100644
--- a/gotweb/gotweb.c
+++ b/gotweb/gotweb.c
@@ -3003,21 +3003,29 @@ gw_get_got_link(struct gw_trans *gw_trans)
static char *
gw_get_site_link(struct gw_trans *gw_trans)
{
- char *link, *repo = "", *action = "";
+ char *link = NULL, *repo = NULL, *action = NULL;
- if (gw_trans->repo_name != NULL)
- if (asprintf(&repo, " / <a href='?path=%s&action=summary'>%s" \
- "</a>", gw_trans->repo_name, gw_trans->repo_name) == -1)
- return NULL;
+ if (gw_trans->repo_name != NULL &&
+ asprintf(&repo, " / <a href='?path=%s&action=summary'>%s</a>",
+ gw_trans->repo_name, gw_trans->repo_name) == -1)
+ return NULL;
- if (gw_trans->action_name != NULL)
- if (asprintf(&action, " / %s", gw_trans->action_name) == -1)
- return NULL;
+ if (gw_trans->action_name != NULL &&
+ asprintf(&action, " / %s", gw_trans->action_name) == -1) {
+ free(repo);
+ return NULL;
+ }
if (asprintf(&link, site_link, GOTWEB,
- gw_trans->gw_conf->got_site_link, repo, action) == -1)
+ gw_trans->gw_conf->got_site_link,
+ repo ? repo : "", action ? action : "") == -1) {
+ free(repo);
+ free(action);
return NULL;
+ }
+ free(repo);
+ free(action);
return link;
}