refs: convert parameter of create_dir_entry() to length-limited string
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
May 22, 2012 at 20:50 UTC
b9146f517a312fed42d12b32e3ee3bd99944121d
1 file changed
+10
-8
refs.c
+10
-8
@@ -294,12 +294,13 @@ static void clear_ref_dir(struct ref_dir *dir)
294
* "refs/heads/") or "" for the top-level directory.
295
*/
296
static struct ref_entry *create_dir_entry(struct ref_cache *ref_cache,
297
- const char *dirname, int incomplete)
297
+ const char *dirname, size_t len,
298
+ int incomplete)
299
{
300
struct ref_entry *direntry;
300
- int len = strlen(dirname);
301
direntry = xcalloc(1, sizeof(struct ref_entry) + len + 1);
302
- memcpy(direntry->name, dirname, len + 1);
302
+ memcpy(direntry->name, dirname, len);
303
+ direntry->name[len] = '\0';
304
direntry->u.subdir.ref_cache = ref_cache;
305
direntry->flag = REF_DIR | (incomplete ? REF_INCOMPLETE : 0);
306
return direntry;
@@ -364,7 +365,7 @@ static struct ref_dir *search_for_subdir(struct ref_dir *dir,
365
* therefore, create an empty record for it but mark
366
* the record complete.
367
*/
367
- entry = create_dir_entry(dir->ref_cache, subdirname, 0);
368
+ entry = create_dir_entry(dir->ref_cache, subdirname, len, 0);
369
add_entry_to_dir(dir, entry);
370
}
371
return get_ref_dir(entry);
@@ -823,7 +824,7 @@ static struct ref_dir *get_packed_refs(struct ref_cache *refs)
824
const char *packed_refs_file;
825
FILE *f;
826
826
- refs->packed = create_dir_entry(refs, "", 0);
827
+ refs->packed = create_dir_entry(refs, "", 0, 0);
828
if (*refs->name)
829
packed_refs_file = git_path_submodule(refs->name, "packed-refs");
830
else
@@ -888,7 +889,8 @@ static void read_loose_refs(const char *dirname, struct ref_dir *dir)
889
} else if (S_ISDIR(st.st_mode)) {
890
strbuf_addch(&refname, '/');
891
add_entry_to_dir(dir,
891
- create_dir_entry(refs, refname.buf, 1));
892
+ create_dir_entry(refs, refname.buf,
893
+ refname.len, 1));
894
} else {
895
if (*refs->name) {
896
hashclr(sha1);
@@ -918,12 +920,12 @@ static struct ref_dir *get_loose_refs(struct ref_cache *refs)
920
* are about to read the only subdirectory that can
921
* hold references:
922
*/
921
- refs->loose = create_dir_entry(refs, "", 0);
923
+ refs->loose = create_dir_entry(refs, "", 0, 0);
924
/*
925
* Create an incomplete entry for "refs/":
926
*/
927
add_entry_to_dir(get_ref_dir(refs->loose),
926
- create_dir_entry(refs, "refs/", 1));
928
+ create_dir_entry(refs, "refs/", 5, 1));
929
}
930
return get_ref_dir(refs->loose);
931
}