summaryrefslogtreecommitdiff
path: root/builtin/apply.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2014-07-19 15:35:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-07-21 17:37:02 (GMT)
commit5c0b13f85ab3a5326508b854768eb70c8829cda4 (patch)
treec498179a86e3e05abb664caa8d943c81ae4142f5 /builtin/apply.c
parent51a60f5bfbaf1ee7c7a2d2b73eca4f042f7af8cb (diff)
downloadgit-5c0b13f85ab3a5326508b854768eb70c8829cda4.zip
git-5c0b13f85ab3a5326508b854768eb70c8829cda4.tar.gz
git-5c0b13f85ab3a5326508b854768eb70c8829cda4.tar.bz2
use xmemdupz() to allocate copies of strings given by start and length
Use xmemdupz() to allocate the memory, copy the data and make sure to NUL-terminate the result, all in one step. The resulting code is shorter, doesn't contain the constants 1 and '\0', and avoids duplicating function parameters. For blame, the last copied byte (o->file.ptr[o->file.size]) is always set to NUL by fake_working_tree_commit() or read_sha1_file(), so no information is lost by the conversion to using xmemdupz(). Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/apply.c')
-rw-r--r--builtin/apply.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin/apply.c b/builtin/apply.c
index 9c5724e..622ee16 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -2869,9 +2869,7 @@ static int apply_binary_fragment(struct image *img, struct patch *patch)
case BINARY_LITERAL_DEFLATED:
clear_image(img);
img->len = fragment->size;
- img->buf = xmalloc(img->len+1);
- memcpy(img->buf, fragment->patch, img->len);
- img->buf[img->len] = '\0';
+ img->buf = xmemdupz(fragment->patch, img->len);
return 0;
}
return -1;