[PATCH v4 13/27] object-file: make `buf` parameter of `index_mem()` a constant
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Jun 4, 2024, 12:37 UTC
- Message-ID
- <62f0e47f94dad4f9a7318a0349bb83bcd29cba61.1717504517.git.ps@pks.im>
- In-Reply-To
- <cover.1717504517.git.ps@pks.im>
The `buf` parameter of `index_mem()` is a non-constant string. This will break once we enable `-Wwrite-strings` because we also pass constants from at least one callsite.
Adapt the parameter to be a constant. As we cannot free the buffer without casting now, this also requires us to move the lifetime of the nested buffer around.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- object-file.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/object-file.c b/object-file.c index 3afe9fce06..b5b5a59dc6 100644 --- a/object-file.c +++ b/object-file.c @@ -2485,12 +2485,13 @@ static int hash_format_check_report(struct fsck_options *opts UNUSED, } static int index_mem(struct index_state *istate, - struct object_id *oid, void *buf, size_t size, + struct object_id *oid, + const void *buf, size_t size, enum object_type type, const char *path, unsigned flags) { + struct strbuf nbuf = STRBUF_INIT; int ret = 0; - int re_allocated = 0; int write_object = flags & HASH_WRITE_OBJECT; if (!type) @@ -2500,11 +2501,10 @@ static int index_mem(struct index_state *istate, * Convert blobs to git internal format */ if ((type == OBJ_BLOB) && path) { - struct strbuf nbuf = STRBUF_INIT; if (convert_to_git(istate, path, buf, size, &nbuf, get_conv_flags(flags))) { - buf = strbuf_detach(&nbuf, &size); - re_allocated = 1; + buf = nbuf.buf; + size = nbuf.len; } } if (flags & HASH_FORMAT_CHECK) { @@ -2521,8 +2521,8 @@ static int index_mem(struct index_state *istate, ret = write_object_file(buf, size, type, oid); else hash_object_file(the_hash_algo, buf, size, type, oid); - if (re_allocated) - free(buf); + + strbuf_release(&nbuf); return ret; }
-- 2.45.1.410.g58bac47f8e.dirty