author | Martins Polakovs <martins.polakovs@gmail.com> | 2009-12-10 15:35:42 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-12-12 10:56:25 (UTC) |
commit | 24538b072718924d3418a258cf0009fb5b5768de (patch) (side-by-side diff) | |
tree | 54a2ea6fb82c5ff99f188624a24b7c5d54657095 | |
parent | f2bf0a05280edddb4961214adfd7b440191737e2 (diff) | |
download | cgit-24538b072718924d3418a258cf0009fb5b5768de.zip cgit-24538b072718924d3418a258cf0009fb5b5768de.tar.gz cgit-24538b072718924d3418a258cf0009fb5b5768de.tar.bz2 |
Fix segfault on ppc when browsing tree
-rw-r--r-- | ui-blob.c | 2 | ||||
-rw-r--r-- | ui-plain.c | 2 | ||||
-rw-r--r-- | ui-tree.c | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -21,59 +21,59 @@ static int walk_tree(const unsigned char *sha1, const char *base,int baselen, memmove(matched_sha1,sha1,20); return 0; } void cgit_print_blob(const char *hex, char *path, const char *head) { unsigned char sha1[20]; enum object_type type; char *buf; unsigned long size; struct commit *commit; const char *paths[] = {path, NULL}; if (hex) { if (get_sha1_hex(hex, sha1)){ cgit_print_error(fmt("Bad hex value: %s", hex)); return; } } else { if (get_sha1(head,sha1)) { cgit_print_error(fmt("Bad ref: %s", head)); return; } } type = sha1_object_info(sha1, &size); if((!hex) && type == OBJ_COMMIT && path) { commit = lookup_commit_reference(sha1); match_path = path; matched_sha1 = sha1; - read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); + read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); type = sha1_object_info(sha1,&size); } if (type == OBJ_BAD) { cgit_print_error(fmt("Bad object name: %s", hex)); return; } buf = read_sha1_file(sha1, &type, &size); if (!buf) { cgit_print_error(fmt("Error reading object %s", hex)); return; } buf[size] = '\0'; ctx.page.mimetype = ctx.qry.mimetype; if (!ctx.page.mimetype) { if (buffer_is_binary(buf, size)) ctx.page.mimetype = "application/octet-stream"; else ctx.page.mimetype = "text/plain"; } ctx.page.filename = path; cgit_print_http_headers(&ctx); write(htmlfd, buf, size); } @@ -59,36 +59,36 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, { if (S_ISDIR(mode)) return READ_TREE_RECURSIVE; if (S_ISREG(mode) && !strncmp(base, match_path, baselen) && !strcmp(pathname, match_path + baselen)) print_object(sha1, pathname); return 0; } void cgit_print_plain(struct cgit_context *ctx) { const char *rev = ctx->qry.sha1; unsigned char sha1[20]; struct commit *commit; const char *paths[] = {ctx->qry.path, NULL}; if (!rev) rev = ctx->qry.head; curr_rev = xstrdup(rev); if (get_sha1(rev, sha1)) { html_status(404, "Not found", 0); return; } commit = lookup_commit_reference(sha1); if (!commit || parse_commit(commit)) { html_status(404, "Not found", 0); return; } match_path = ctx->qry.path; - read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); + read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); if (!match) html_status(404, "Not found", 0); } @@ -251,35 +251,35 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, * path: path to tree or blob */ void cgit_print_tree(const char *rev, char *path) { unsigned char sha1[20]; struct commit *commit; const char *paths[] = {path, NULL}; if (!rev) rev = ctx.qry.head; curr_rev = xstrdup(rev); if (get_sha1(rev, sha1)) { cgit_print_error(fmt("Invalid revision name: %s", rev)); return; } commit = lookup_commit_reference(sha1); if (!commit || parse_commit(commit)) { cgit_print_error(fmt("Invalid commit reference: %s", rev)); return; } html("path: <a href='"); html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev))); html("'>root</a>"); if (path == NULL) { ls_tree(commit->tree->object.sha1, NULL); return; } match_path = path; - read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); + read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); ls_tail(); } |