Game of Trees Repos

Commit Diff

Commit:: f71c0a3a2e69723014f769673f7954114b01d36e
From:: Tracey Emery <tracey@traceyemery.net>
Date:: Tue Jun 23 20:27:11 2020 UTC
Message:: move gw_conf malloc to parse.y and cleanup another one-line set/check fix rash pointer change in last edit
Actions:: Patch | Tree
commit - 74ad335c1de45b23669aa4c545c0ed88b9312693
commit + f71c0a3a2e69723014f769673f7954114b01d36e
blob - 0af46f6d0f3ce6f15863ad64dec29f5f54ca2757
blob + f52838f6bc6e34b30434aaefd4f77f3cc7dbde38
--- gotweb/gotweb.c
+++ gotweb/gotweb.c
@@ -4653,13 +4653,6 @@ main(int argc, char *argv[])
 	kerr = khttp_parse(gw_trans->gw_req, gw_keys, KEY__ZMAX, &page, 1, 0);
 	if (kerr != KCGI_OK) {
 		error = gw_kcgi_error(kerr);
-		goto done;
-	}
-
-	if ((gw_trans->gw_conf =
-	    malloc(sizeof(struct gotweb_config))) == NULL) {
-		gw_malloc = 0;
-		error = got_error_from_errno("malloc");
 		goto done;
 	}
 
@@ -4702,6 +4695,7 @@ done:
 		free(gw_trans->gw_conf->got_site_link);
 		free(gw_trans->gw_conf->got_logo);
 		free(gw_trans->gw_conf->got_logo_url);
+		free(gw_trans->gw_conf);
 		free(gw_trans->commit_id);
 		free(gw_trans->next_id);
 		free(gw_trans->next_prev_id);
blob - f9275d17b97b19973d9956571f8dc6a2a2a2afe3
blob + e137202c2345719205d64b2bd288ce5219fe4f74
--- gotweb/parse.y
+++ gotweb/parse.y
@@ -84,7 +84,7 @@ int	 symset(const char *, const char *, int);
 char	*symget(const char *);
 
 const struct got_error* gerror = NULL;
-struct gotweb_config		 gw_conf;
+struct gotweb_config		*gw_conf;
 
 typedef struct {
 	union {
@@ -129,8 +129,8 @@ boolean		: STRING {
 		| ON { $$ = 1; }
 		;
 main		: GOT_REPOS_PATH STRING {
-			gw_conf.got_repos_path = strdup($2);
-			if (gw_conf.got_repos_path== NULL) {
+			gw_conf->got_repos_path = strdup($2);
+			if (gw_conf->got_repos_path== NULL) {
 				free($2);
 				yyerror("strdup");
 				YYERROR;
@@ -138,70 +138,70 @@ main		: GOT_REPOS_PATH STRING {
 		}
 		| GOT_MAX_REPOS NUMBER {
 			if ($2 > 0)
-				gw_conf.got_max_repos = $2;
+				gw_conf->got_max_repos = $2;
 		}
 		| GOT_SITE_NAME STRING {
-			gw_conf.got_site_name = strdup($2);
-			if (gw_conf.got_site_name == NULL) {
+			gw_conf->got_site_name = strdup($2);
+			if (gw_conf->got_site_name == NULL) {
 				free($2);
 				yyerror("strdup");
 				YYERROR;
 			}
 		}
 		| GOT_SITE_OWNER STRING {
-			gw_conf.got_site_owner = strdup($2);
-			if (gw_conf.got_site_owner == NULL) {
+			gw_conf->got_site_owner = strdup($2);
+			if (gw_conf->got_site_owner == NULL) {
 				free($2);
 				yyerror("strdup");
 				YYERROR;
 			}
 		}
 		| GOT_SITE_LINK STRING {
-			gw_conf.got_site_link = strdup($2);
-			if (gw_conf.got_site_link == NULL) {
+			gw_conf->got_site_link = strdup($2);
+			if (gw_conf->got_site_link == NULL) {
 				free($2);
 				yyerror("strdup");
 				YYERROR;
 			}
 		}
 		| GOT_LOGO STRING {
-			gw_conf.got_logo = strdup($2);
-			if (gw_conf.got_logo== NULL) {
+			gw_conf->got_logo = strdup($2);
+			if (gw_conf->got_logo== NULL) {
 				free($2);
 				yyerror("strdup");
 				YYERROR;
 			}
 		}
 		| GOT_LOGO_URL STRING {
-			gw_conf.got_logo_url = strdup($2);
-			if (gw_conf.got_logo_url== NULL) {
+			gw_conf->got_logo_url = strdup($2);
+			if (gw_conf->got_logo_url== NULL) {
 				free($2);
 				yyerror("strdup");
 				YYERROR;
 			}
 		}
 		| GOT_SHOW_SITE_OWNER boolean {
-			gw_conf.got_show_site_owner = $2;
+			gw_conf->got_show_site_owner = $2;
 		}
 		| GOT_SHOW_REPO_OWNER boolean {
-			gw_conf.got_show_repo_owner = $2;
+			gw_conf->got_show_repo_owner = $2;
 		}
 		| GOT_SHOW_REPO_AGE boolean {
-			gw_conf.got_show_repo_age = $2;
+			gw_conf->got_show_repo_age = $2;
 		}
 		| GOT_SHOW_REPO_DESCRIPTION boolean {
-			gw_conf.got_show_repo_description = $2;
+			gw_conf->got_show_repo_description = $2;
 		}
 		| GOT_SHOW_REPO_CLONEURL boolean {
-			gw_conf.got_show_repo_cloneurl = $2;
+			gw_conf->got_show_repo_cloneurl = $2;
 		}
 		| GOT_MAX_REPOS_DISPLAY NUMBER {
 			if ($2 > 0)
-				gw_conf.got_max_repos_display = $2;
+				gw_conf->got_max_repos_display = $2;
 		}
 		| GOT_MAX_COMMITS_DISPLAY NUMBER {
 			if ($2 > 0)
-				gw_conf.got_max_commits_display = $2;
+				gw_conf->got_max_commits_display = $2;
 		}
 		;
 %%
@@ -581,44 +581,49 @@ popfile(void)
 const struct got_error*
 parse_gotweb_config(struct gotweb_config **gconf, const char *filename)
 {
-	gw_conf.got_repos_path = strdup(D_GOTPATH);
-	if (gw_conf.got_repos_path == NULL) {
+	gw_conf = malloc(sizeof(struct gotweb_config));
+	if (gw_conf == NULL) {
+		gerror = got_error_from_errno("malloc");
+		goto done;
+	}
+	gw_conf->got_repos_path = strdup(D_GOTPATH);
+	if (gw_conf->got_repos_path == NULL) {
 		gerror = got_error_from_errno("strdup");
 		goto done;
 	}
-	gw_conf.got_site_name = strdup(D_SITENAME);
-	if (gw_conf.got_site_name == NULL) {
+	gw_conf->got_site_name = strdup(D_SITENAME);
+	if (gw_conf->got_site_name == NULL) {
 		gerror = got_error_from_errno("strdup");
 		goto done;
 	}
-	gw_conf.got_site_owner = strdup(D_SITEOWNER);
-	if (gw_conf.got_site_owner == NULL) {
+	gw_conf->got_site_owner = strdup(D_SITEOWNER);
+	if (gw_conf->got_site_owner == NULL) {
 		gerror = got_error_from_errno("strdup");
 		goto done;
 	}
-	gw_conf.got_site_link = strdup(D_SITELINK);
-	if (gw_conf.got_site_link == NULL) {
+	gw_conf->got_site_link = strdup(D_SITELINK);
+	if (gw_conf->got_site_link == NULL) {
 		gerror = got_error_from_errno("strdup");
 		goto done;
 	}
-	gw_conf.got_logo = strdup(D_GOTLOGO);
-	if (gw_conf.got_logo == NULL) {
+	gw_conf->got_logo = strdup(D_GOTLOGO);
+	if (gw_conf->got_logo == NULL) {
 		gerror = got_error_from_errno("strdup");
 		goto done;
 	}
-	gw_conf.got_logo_url = strdup(D_GOTURL);
-	if (gw_conf.got_logo_url == NULL) {
+	gw_conf->got_logo_url = strdup(D_GOTURL);
+	if (gw_conf->got_logo_url == NULL) {
 		gerror = got_error_from_errno("strdup");
 		goto done;
 	}
-	gw_conf.got_show_site_owner = D_SHOWSOWNER;
-	gw_conf.got_show_repo_owner = D_SHOWROWNER;
-	gw_conf.got_show_repo_age = D_SHOWAGE;
-	gw_conf.got_show_repo_description = D_SHOWDESC;
-	gw_conf.got_show_repo_cloneurl = D_SHOWURL;
-	gw_conf.got_max_repos = D_MAXREPO;
-	gw_conf.got_max_repos_display = D_MAXREPODISP;
-	gw_conf.got_max_commits_display = D_MAXCOMMITDISP;
+	gw_conf->got_show_site_owner = D_SHOWSOWNER;
+	gw_conf->got_show_repo_owner = D_SHOWROWNER;
+	gw_conf->got_show_repo_age = D_SHOWAGE;
+	gw_conf->got_show_repo_description = D_SHOWDESC;
+	gw_conf->got_show_repo_cloneurl = D_SHOWURL;
+	gw_conf->got_max_repos = D_MAXREPO;
+	gw_conf->got_max_repos_display = D_MAXREPODISP;
+	gw_conf->got_max_commits_display = D_MAXCOMMITDISP;
 
 	/*
 	 * We don't require that the gotweb config file exists
@@ -635,7 +640,7 @@ parse_gotweb_config(struct gotweb_config **gconf, cons
 	yyparse();
 	popfile();
 done:
-	*gconf = &gw_conf;
+	*gconf = gw_conf;
 	return gerror;
 }