From 41f9c4e2f66252c83c6524fa4a346839d4c454b2 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Sun, 3 Mar 2013 17:27:46 +0100 Subject: ui-blob.c: Use a context structure in walk_tree() Do not misuse global variables to save the context. Instead, use the context pointer which was designed to share information between a read_tree_fn and the caller. This also prevents from potential misuse of the global pointers match_path and matched_sha1 after the referenced values have been overwritten on the stack. Signed-off-by: Lukas Fleischer --- ui-blob.c | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/ui-blob.c b/ui-blob.c index d382ba3..c59fbcb 100644 --- a/ui-blob.c +++ b/ui-blob.c @@ -11,17 +11,22 @@ #include "html.h" #include "ui-shared.h" -static char *match_path; -static unsigned char *matched_sha1; -static int found_path; +struct walk_tree_context { + char *match_path; + unsigned char *matched_sha1; + int found_path; +}; static int walk_tree(const unsigned char *sha1, const char *base, int baselen, - const char *pathname, unsigned mode, int stage, void *cbdata) { - if (strncmp(base, match_path, baselen) - || strcmp(match_path + baselen, pathname)) + const char *pathname, unsigned mode, int stage, void *cbdata) +{ + struct walk_tree_context *walk_tree_ctx = cbdata; + + if (strncmp(base, walk_tree_ctx->match_path, baselen) + || strcmp(walk_tree_ctx->match_path + baselen, pathname)) return READ_TREE_RECURSIVE; - memmove(matched_sha1, sha1, 20); - found_path = 1; + memmove(walk_tree_ctx->matched_sha1, sha1, 20); + walk_tree_ctx->found_path = 1; return 0; } @@ -40,16 +45,19 @@ int cgit_print_file(char *path, const char *head) .nr = 1, .items = &path_items }; + struct walk_tree_context walk_tree_ctx = { + .match_path = path, + .matched_sha1 = sha1, + .found_path = 0 + }; + if (get_sha1(head, sha1)) return -1; type = sha1_object_info(sha1, &size); if (type == OBJ_COMMIT && path) { commit = lookup_commit_reference(sha1); - match_path = path; - matched_sha1 = sha1; - found_path = 0; - read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, NULL); - if (!found_path) + read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); + if (!walk_tree_ctx.found_path) return -1; type = sha1_object_info(sha1, &size); } @@ -78,6 +86,10 @@ void cgit_print_blob(const char *hex, char *path, const char *head) .nr = 1, .items = &path_items }; + struct walk_tree_context walk_tree_ctx = { + .match_path = path, + .matched_sha1 = sha1, + }; if (hex) { if (get_sha1_hex(hex, sha1)) { @@ -95,9 +107,7 @@ void cgit_print_blob(const char *hex, char *path, const char *head) if ((!hex) && type == OBJ_COMMIT && path) { commit = lookup_commit_reference(sha1); - match_path = path; - matched_sha1 = sha1; - read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, NULL); + read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); type = sha1_object_info(sha1,&size); } -- cgit 1.4.1 03 02:08:44 -0500'>2020-03-03Use getoptsJune McEnroe 2020-01-28Call fopencookie with a+June McEnroe Otherwise interleaved reads and writes can interfere with each other, since you're supposed to have intervening fseeks. 2019-12-24Exit git-fetch-email on getopt failure 1.0June McEnroe 2019-12-23Export References headerJune McEnroe 2019-12-23Add (GNU/)Linux compatibilityJune McEnroe Implements a dumb version of readpassphrase that calls getpass and implements funopen in terms of fopencookie. 2019-12-23Handle folded From headersJune McEnroe 2019-12-23Restrict search to plain-text messagesJune McEnroe 2019-12-23Properly support using drill rather than digJune McEnroe Silly drill doesn't have +short, so emulate it by waiting for the ANSWER SECTION and skipping the leading fields. 2019-12-22Document dig requirement in imbox(1)June McEnroe 2019-12-22Add CAVEAT about expecting plain-textJune McEnroe 2019-12-22Quote user, pass and mailboxJune McEnroe 2019-12-22Use sequence numbers rather than UIDsJune McEnroe We aren't doing any expunging or anything across different sessions, so it's safe to just use sequence numbers. 2019-12-22Use EXAMINE rather than SELECTJune McEnroe This is a read-only operation. 2019-12-22Export To and CC headersJune McEnroe 2019-12-22Add missing includeJune McEnroe 2019-12-22Export In-Reply-To headersJune McEnroe 2019-12-21Add git-fetch-email to READMEJune McEnroe 2019-12-21Clarify purpose in READMEJune McEnroe 2019-12-21Add READMEJune McEnroe 2019-12-21Add copyright header to git-fetch-emailJune McEnroe 2019-12-21Add git-fetch-email to SEE ALSO of imboxJune McEnroe 2019-12-21Add git-fetch-email wrapperJune McEnroe 2019-12-21Determine host by SRV lookupJune McEnroe 2019-12-21Clean up remaining codeJune McEnroe 2019-12-21Clean up mboxrd codeJune McEnroe 2019-12-21Convert CRLF to LFJune McEnroe 2019-12-21Implement -CFSTJune McEnroe 2019-12-21Rewrite aspirational manualJune McEnroe 2019-12-21Null-terminate read literalsJune McEnroe