diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-07-21 23:35:39 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-07-21 23:35:39 +0400 |
commit | 9ab08822556c49a7856dadd0e9a42f9ec2aaf850 (patch) | |
tree | f52f20367d13f2078fe6199e230322c899b9308d /builtin/apply.c | |
parent | 0eff86e4f440fedf26f02f4c3b1a3ead8bfbe6f8 (diff) | |
parent | 5c0b13f85ab3a5326508b854768eb70c8829cda4 (diff) |
Merge branch 'maint'
* maint:
use xmemdupz() to allocate copies of strings given by start and length
use xcalloc() to allocate zero-initialized memory
Diffstat (limited to 'builtin/apply.c')
-rw-r--r-- | builtin/apply.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index 5fd099ed40..9f8f5bac07 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -2867,9 +2867,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; |