diff options
| author | Russell Belfer <rb@github.com> | 2012-04-13 13:00:10 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2012-04-17 10:47:39 -0700 |
| commit | 44ef8b1b300f0cd3d8572fa1b40d257462f28240 (patch) | |
| tree | 34f38bee213d1041fec7ac9dc4e63191182f3bf8 /src/pack.c | |
| parent | f201d613a80f7ad6f54d90eb7a7a0d8b8c72676b (diff) | |
| download | libgit2-44ef8b1b300f0cd3d8572fa1b40d257462f28240.tar.gz | |
Fix warnings on 64-bit windows builds
This fixes all the warnings on win64 except those in deps, which
come from the regex code.
Diffstat (limited to 'src/pack.c')
| -rw-r--r-- | src/pack.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/pack.c b/src/pack.c index a4e506945..af8be255d 100644 --- a/src/pack.c +++ b/src/pack.c @@ -165,6 +165,7 @@ static int pack_index_open(struct git_pack_file *p) { char *idx_name; int error; + size_t name_len, offset; if (p->index_map.data) return 0; @@ -172,7 +173,11 @@ static int pack_index_open(struct git_pack_file *p) idx_name = git__strdup(p->pack_name); GITERR_CHECK_ALLOC(idx_name); - strcpy(idx_name + strlen(idx_name) - strlen(".pack"), ".idx"); + name_len = strlen(idx_name); + offset = name_len - strlen(".pack"); + assert(offset < name_len); /* make sure no underflow */ + + strncpy(idx_name + offset, ".idx", name_len - offset); error = pack_index_check(idx_name, p); git__free(idx_name); @@ -474,7 +479,7 @@ git_off_t get_delta_base( * ***********************************************************/ -static struct git_pack_file *packfile_alloc(int extra) +static struct git_pack_file *packfile_alloc(size_t extra) { struct git_pack_file *p = git__calloc(1, sizeof(*p) + extra); if (p != NULL) |