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>
Ilari Liusvaara committed
Jan 26, 2010 at 20:24 UTC
5bf9219d01b16444b316fe764b58d15bd9265f74
2 files changed
+12
-4
git-compat-util.h
+1
@@ -343,6 +343,7 @@ extern void release_pack_memory(size_t, int);
343
344
extern char *xstrdup(const char *str);
345
extern void *xmalloc(size_t size);
346
+extern void *xmallocz(size_t size);
347
extern void *xmemdupz(const void *data, size_t len);
348
extern char *xstrndup(const char *str, size_t len);
349
extern void *xrealloc(void *ptr, size_t size);
wrapper.c
+11
-4
@@ -34,6 +34,16 @@ void *xmalloc(size_t size)
34
return ret;
35
}
36
37
+void *xmallocz(size_t size)
38
+{
39
+ void *ret;
40
+ if (size + 1 < size)
41
+ die("Data too large to fit into virtual memory space.");
42
+ ret = xmalloc(size + 1);
43
+ ((char*)ret)[size] = 0;
44
+ return ret;
45
+}
46
+
47
/*
48
* xmemdupz() allocates (len + 1) bytes of memory, duplicates "len" bytes of
49
* "data" to the allocated memory, zero terminates the allocated memory,
@@ -42,10 +52,7 @@ void *xmalloc(size_t size)
52
*/
53
void *xmemdupz(const void *data, size_t len)
54
{
45
- char *p = xmalloc(len + 1);
46
- memcpy(p, data, len);
47
- p[len] = '\0';
48
- return p;
55
+ return memcpy(xmallocz(len), data, len);
56
}
57
58
char *xstrndup(const char *str, size_t len)