Commit 4d6abe2b984fb93fee0027acd0a674d80afb249b
2020-02-13T10:55:02
no need to deep-copy repo_file param from querystring; add some XXX comments
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 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67
diff --git a/gotweb/gotweb.c b/gotweb/gotweb.c
index 726420c..98f6954 100644
--- a/gotweb/gotweb.c
+++ b/gotweb/gotweb.c
@@ -63,7 +63,7 @@ struct gw_trans {
const char *repo_name;
char *repo_path;
char *commit;
- char *repo_file;
+ const char *repo_file;
char *repo_folder;
char *headref;
unsigned int action;
@@ -1669,11 +1669,8 @@ gw_parse_querystring(struct gw_trans *gw_trans)
return got_error_from_errno("asprintf");
}
- if ((p = gw_trans->gw_req->fieldmap[KEY_FILE])) {
- if (asprintf(&gw_trans->repo_file, "%s",
- p->parsed.s) == -1)
- return got_error_from_errno("asprintf");
- }
+ if ((p = gw_trans->gw_req->fieldmap[KEY_FILE]))
+ gw_trans->repo_file = p->parsed.s;
if ((p = gw_trans->gw_req->fieldmap[KEY_FOLDER])) {
if (asprintf(&gw_trans->repo_folder, "%s",
@@ -1754,6 +1751,7 @@ gw_display_open(struct gw_trans *gw_trans, enum khttp code, enum kmime mime)
if (kerr != KCGI_OK)
return gw_kcgi_error(kerr);
+ /* XXX repo_file could be NULL if not present in querystring */
if (gw_trans->mime == KMIME_APP_OCTET_STREAM) {
kerr = khttp_head(gw_trans->gw_req,
kresps[KRESP_CONTENT_DISPOSITION],
@@ -3413,6 +3411,7 @@ gw_blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
"blame_hash", KATTR__MAX);
if (kerr != KCGI_OK)
goto err;
+ /* XXX repo_file could be NULL if not present in querystring */
if (asprintf(&href_diff,
"?path=%s&action=diff&commit=%s&file=%s&folder=%s",
a->gw_trans->repo_name, bline->id_str,
@@ -3505,6 +3504,7 @@ gw_output_file_blame(struct gw_trans *gw_trans)
if (error)
return error;
+ /* XXX repo_file could be NULL if not present in querystring */
if (asprintf(&path, "%s%s%s",
gw_trans->repo_folder ? gw_trans->repo_folder : "",
gw_trans->repo_folder ? "/" : "",
@@ -3615,6 +3615,7 @@ gw_output_blob_buf(struct gw_trans *gw_trans)
if (error)
return error;
+ /* XXX repo_file could be NULL if not present in querystring */
if (asprintf(&path, "%s%s%s",
gw_trans->repo_folder ? gw_trans->repo_folder : "",
gw_trans->repo_folder ? "/" : "",
@@ -4304,7 +4305,6 @@ done:
free(gw_trans->gw_conf);
free(gw_trans->commit);
free(gw_trans->repo_path);
- free(gw_trans->repo_file);
free(gw_trans->headref);
TAILQ_FOREACH_SAFE(dir, &gw_trans->gw_dirs, entry, tdir) {