Commit d6c87207755e1465c12ad4f1620f634b5b1848c0
2019-08-02T16:24:13
require callers to pass path length to got_fileindex_entry_get()
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 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121
diff --git a/lib/fileindex.c b/lib/fileindex.c
index 77e03da..d12affd 100644
--- a/lib/fileindex.c
+++ b/lib/fileindex.c
@@ -204,12 +204,13 @@ got_fileindex_entry_remove(struct got_fileindex *fileindex,
}
struct got_fileindex_entry *
-got_fileindex_entry_get(struct got_fileindex *fileindex, const char *path)
+got_fileindex_entry_get(struct got_fileindex *fileindex, const char *path,
+ size_t path_len)
{
struct got_fileindex_entry key;
memset(&key, 0, sizeof(key));
key.path = (char *)path;
- key.path_len = strlen(path);
+ key.path_len = path_len;
return RB_FIND(got_fileindex_tree, &fileindex->entries, &key);
}
diff --git a/lib/got_lib_fileindex.h b/lib/got_lib_fileindex.h
index 41f2dcd..f1d4506 100644
--- a/lib/got_lib_fileindex.h
+++ b/lib/got_lib_fileindex.h
@@ -106,7 +106,7 @@ const struct got_error *got_fileindex_entry_add(struct got_fileindex *,
void got_fileindex_entry_remove(struct got_fileindex *,
struct got_fileindex_entry *);
struct got_fileindex_entry *got_fileindex_entry_get(struct got_fileindex *,
- const char *);
+ const char *, size_t);
const struct got_error *got_fileindex_read(struct got_fileindex *, FILE *);
typedef const struct got_error *(*got_fileindex_cb)(void *,
struct got_fileindex_entry *);
diff --git a/lib/worktree.c b/lib/worktree.c
index fe6944a..64ad2d2 100644
--- a/lib/worktree.c
+++ b/lib/worktree.c
@@ -865,7 +865,7 @@ update_blob_fileindex_entry(struct got_worktree *worktree,
const struct got_error *err = NULL;
if (ie == NULL)
- ie = got_fileindex_entry_get(fileindex, path);
+ ie = got_fileindex_entry_get(fileindex, path, strlen(path));
if (ie)
err = got_fileindex_entry_update(ie, ondisk_path,
blob->id.sha1, worktree->base_commit_id->sha1,
@@ -1908,7 +1908,8 @@ merge_file_cb(void *arg, struct got_blob_object *blob1,
int local_changes_subsumed;
if (blob1 && blob2) {
- ie = got_fileindex_entry_get(a->fileindex, path2);
+ ie = got_fileindex_entry_get(a->fileindex, path2,
+ strlen(path2));
if (ie == NULL)
return (*a->progress_cb)(a->progress_arg,
GOT_STATUS_MISSING, path2);
@@ -1938,7 +1939,8 @@ merge_file_cb(void *arg, struct got_blob_object *blob1,
ondisk_path, path2, sb.st_mode, blob2, a->commit_id2, repo,
a->progress_cb, a->progress_arg);
} else if (blob1) {
- ie = got_fileindex_entry_get(a->fileindex, path1);
+ ie = got_fileindex_entry_get(a->fileindex, path1,
+ strlen(path1));
if (ie == NULL)
return (*a->progress_cb)(a->progress_arg,
GOT_STATUS_MISSING, path2);
@@ -1992,7 +1994,8 @@ merge_file_cb(void *arg, struct got_blob_object *blob1,
if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
path2) == -1)
return got_error_from_errno("asprintf");
- ie = got_fileindex_entry_get(a->fileindex, path2);
+ ie = got_fileindex_entry_get(a->fileindex, path2,
+ strlen(path2));
if (ie) {
err = get_file_status(&status, &sb, ie, ondisk_path,
repo);
@@ -2291,7 +2294,7 @@ void *status_arg, struct got_repository *repo)
struct got_fileindex_entry *ie;
struct stat sb;
- ie = got_fileindex_entry_get(fileindex, path);
+ ie = got_fileindex_entry_get(fileindex, path, strlen(path));
if (ie)
return report_file_status(ie, ondisk_path, status_cb,
status_arg, repo);
@@ -2448,7 +2451,7 @@ schedule_addition(const char *ondisk_path, struct got_fileindex *fileindex,
struct got_fileindex_entry *ie;
/* Re-adding an existing entry is a no-op. */
- if (got_fileindex_entry_get(fileindex, relpath) != NULL)
+ if (got_fileindex_entry_get(fileindex, relpath, strlen(relpath)))
return NULL;
err = got_fileindex_entry_alloc(&ie, ondisk_path, relpath, NULL, NULL);
@@ -2519,7 +2522,7 @@ schedule_for_deletion(const char *ondisk_path, struct got_fileindex *fileindex,
unsigned char status;
struct stat sb;
- ie = got_fileindex_entry_get(fileindex, relpath);
+ ie = got_fileindex_entry_get(fileindex, relpath, strlen(relpath));
if (ie == NULL)
return got_error(GOT_ERR_BAD_PATH);
@@ -2609,7 +2612,7 @@ revert_file(struct got_worktree *worktree, struct got_fileindex *fileindex,
if (err)
goto done;
- ie = got_fileindex_entry_get(fileindex, relpath);
+ ie = got_fileindex_entry_get(fileindex, relpath, strlen(relpath));
if (ie == NULL) {
err = got_error(GOT_ERR_BAD_PATH);
goto done;
@@ -3272,7 +3275,7 @@ update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
struct got_fileindex_entry *ie;
struct got_commitable *ct = pe->data;
- ie = got_fileindex_entry_get(fileindex, pe->path);
+ ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
if (ie) {
if (ct->status == GOT_STATUS_DELETE) {
got_fileindex_entry_remove(fileindex, ie);