mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 16:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui-blob.c: Use a context structure in walk_tree()

Browse Source 
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 <cgit@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2013-03-03 17:27:46 +01:00 committed by Jason A. Donenfeld
parent 973deda0ea
commit 41f9c4e2f6
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ui-blob.c
View File

@ -11,17 +11,22 @@
#include "html.h" #include "html.h"
#include "ui-shared.h" #include "ui-shared.h"
static char *match_path; struct walk_tree_context {
static unsigned char *matched_sha1; char *match_path;
static int found_path; unsigned char *matched_sha1;
int found_path;
};
static int walk_tree(const unsigned char *sha1, const char *base, int baselen, static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
const char *pathname, unsigned mode, int stage, void *cbdata) { const char *pathname, unsigned mode, int stage, void *cbdata)
if (strncmp(base, match_path, baselen) {
|| strcmp(match_path + baselen, pathname)) 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; return READ_TREE_RECURSIVE;
memmove(matched_sha1, sha1, 20); memmove(walk_tree_ctx->matched_sha1, sha1, 20);
found_path = 1; walk_tree_ctx->found_path = 1;
return 0; return 0;
} }
@ -40,16 +45,19 @@ int cgit_print_file(char *path, const char *head)
.nr = 1, .nr = 1,
.items = &path_items .items = &path_items
}; };
struct walk_tree_context walk_tree_ctx = {
.match_path = path,
.matched_sha1 = sha1,
.found_path = 0
};
if (get_sha1(head, sha1)) if (get_sha1(head, sha1))
return -1; return -1;
type = sha1_object_info(sha1, &size); type = sha1_object_info(sha1, &size);
if (type == OBJ_COMMIT && path) { if (type == OBJ_COMMIT && path) {
commit = lookup_commit_reference(sha1); commit = lookup_commit_reference(sha1);
match_path = path; read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
matched_sha1 = sha1; if (!walk_tree_ctx.found_path)
found_path = 0;
read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, NULL);
if (!found_path)
return -1; return -1;
type = sha1_object_info(sha1, &size); type = sha1_object_info(sha1, &size);
} }
@ -78,6 +86,10 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
.nr = 1, .nr = 1,
.items = &path_items .items = &path_items
}; };
struct walk_tree_context walk_tree_ctx = {
.match_path = path,
.matched_sha1 = sha1,
};
if (hex) { if (hex) {
if (get_sha1_hex(hex, sha1)) { 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) { if ((!hex) && type == OBJ_COMMIT && path) {
commit = lookup_commit_reference(sha1); commit = lookup_commit_reference(sha1);
match_path = path; read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
matched_sha1 = sha1;
read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, NULL);
type = sha1_object_info(sha1,&size); type = sha1_object_info(sha1,&size);
} }