diff options
| author | John Keeping | 2016-08-13 11:54:46 +0100 |
|---|---|---|
| committer | John Keeping | 2016-10-01 11:46:55 +0100 |
| commit | e18a85b6a298feef88da8085ef16fd20ce971071 (patch) | |
| tree | 617a64efc192421222549ffe7ae522f5959c9ec5 | |
| parent | f80b73fa20d5c884114b971a20e1b4bb847e054e (diff) | |
| download | cgit-e18a85b6a298feef88da8085ef16fd20ce971071.tar.gz cgit-e18a85b6a298feef88da8085ef16fd20ce971071.tar.bz2 cgit-e18a85b6a298feef88da8085ef16fd20ce971071.zip | |
ui-tree: remove a fixed size buffer
As libgit.a moves away from using fixed size buffers, there is no
guarantee that PATH_MAX is sufficient for all of the paths in a Git
tree, so we should use a dynamically sized buffer here.
Coverity-Id: 141884
Signed-off-by: John Keeping <john@keeping.me.uk>
| -rw-r--r-- | ui-tree.c | 15 |
1 files changed, 9 insertions, 6 deletions
| @@ -324,22 +324,25 @@ static int walk_tree(const unsigned char *sha1, struct strbuf *base, | |||
| 324 | const char *pathname, unsigned mode, int stage, void *cbdata) | 324 | const char *pathname, unsigned mode, int stage, void *cbdata) |
| 325 | { | 325 | { |
| 326 | struct walk_tree_context *walk_tree_ctx = cbdata; | 326 | struct walk_tree_context *walk_tree_ctx = cbdata; |
| 327 | static char buffer[PATH_MAX]; | ||
| 328 | 327 | ||
| 329 | if (walk_tree_ctx->state == 0) { | 328 | if (walk_tree_ctx->state == 0) { |
| 330 | memcpy(buffer, base->buf, base->len); | 329 | struct strbuf buffer = STRBUF_INIT; |
| 331 | strcpy(buffer + base->len, pathname); | 330 | |
| 332 | if (strcmp(walk_tree_ctx->match_path, buffer)) | 331 | strbuf_addbuf(&buffer, base); |
| 332 | strbuf_addstr(&buffer, pathname); | ||
| 333 | if (strcmp(walk_tree_ctx->match_path, buffer.buf)) | ||
| 333 | return READ_TREE_RECURSIVE; | 334 | return READ_TREE_RECURSIVE; |
| 334 | 335 | ||
| 335 | if (S_ISDIR(mode)) { | 336 | if (S_ISDIR(mode)) { |
| 336 | walk_tree_ctx->state = 1; | 337 | walk_tree_ctx->state = 1; |
| 337 | set_title_from_path(buffer); | 338 | set_title_from_path(buffer.buf); |
| 339 | strbuf_release(&buffer); | ||
| 338 | ls_head(); | 340 | ls_head(); |
| 339 | return READ_TREE_RECURSIVE; | 341 | return READ_TREE_RECURSIVE; |
| 340 | } else { | 342 | } else { |
| 341 | walk_tree_ctx->state = 2; | 343 | walk_tree_ctx->state = 2; |
| 342 | print_object(sha1, buffer, pathname, walk_tree_ctx->curr_rev); | 344 | print_object(sha1, buffer.buf, pathname, walk_tree_ctx->curr_rev); |
| 345 | strbuf_release(&buffer); | ||
| 343 | return 0; | 346 | return 0; |
| 344 | } | 347 | } |
| 345 | } | 348 | } |
