diff options
| author | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | 2010-01-26 20:24:12 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-26 12:57:53 -0800 |
| commit | 5bf9219d01b16444b316fe764b58d15bd9265f74 (patch) | |
| tree | a218ec5aa622712e03dace7acce8aaf711a61636 | |
| parent | 35eabd1579726d594e84fc8328a5c87693dd065a (diff) | |
| download | git-5bf9219d01b16444b316fe764b58d15bd9265f74.tar.gz git-5bf9219d01b16444b316fe764b58d15bd9265f74.tar.xz | |
Add xmallocz()
Add routine for allocating NUL-terminated memory block without risking
integer overflow in addition of +1 for NUL byte.
[jc: with suggestion from Bill Lear]
Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | git-compat-util.h | 1 | ||||
| -rw-r--r-- | wrapper.c | 15 |
2 files changed, 12 insertions, 4 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index ef6080338..31e2ef9e9 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -343,6 +343,7 @@ extern void release_pack_memory(size_t, int); extern char *xstrdup(const char *str); extern void *xmalloc(size_t size); +extern void *xmallocz(size_t size); extern void *xmemdupz(const void *data, size_t len); extern char *xstrndup(const char *str, size_t len); extern void *xrealloc(void *ptr, size_t size); @@ -34,6 +34,16 @@ void *xmalloc(size_t size) return ret; } +void *xmallocz(size_t size) +{ + void *ret; + if (size + 1 < size) + die("Data too large to fit into virtual memory space."); + ret = xmalloc(size + 1); + ((char*)ret)[size] = 0; + return ret; +} + /* * xmemdupz() allocates (len + 1) bytes of memory, duplicates "len" bytes of * "data" to the allocated memory, zero terminates the allocated memory, @@ -42,10 +52,7 @@ void *xmalloc(size_t size) */ void *xmemdupz(const void *data, size_t len) { - char *p = xmalloc(len + 1); - memcpy(p, data, len); - p[len] = '\0'; - return p; + return memcpy(xmallocz(len), data, len); } char *xstrndup(const char *str, size_t len) |