summaryrefslogtreecommitdiff
path: root/wrapper.c
diff options
context:
space:
mode:
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>2010-01-26 18:24:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-26 20:57:53 (GMT)
commit5bf9219d01b16444b316fe764b58d15bd9265f74 (patch)
treea218ec5aa622712e03dace7acce8aaf711a61636 /wrapper.c
parent35eabd1579726d594e84fc8328a5c87693dd065a (diff)
downloadgit-5bf9219d01b16444b316fe764b58d15bd9265f74.zip
git-5bf9219d01b16444b316fe764b58d15bd9265f74.tar.gz
git-5bf9219d01b16444b316fe764b58d15bd9265f74.tar.bz2
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>
Diffstat (limited to 'wrapper.c')
-rw-r--r--wrapper.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/wrapper.c b/wrapper.c
index c9be140..0e3e20a 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -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)