summaryrefslogtreecommitdiff
path: root/libc/stdlib/malloc/Makefile
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-08-06 03:28:45 +0000
committerEric Andersen <andersen@codepoet.org>2002-08-06 03:28:45 +0000
commit64f78ef63be0e51e894ffd096de35c8a8f2ab034 (patch)
treebde240ac52cce20df63204506f4d4caa18dee723 /libc/stdlib/malloc/Makefile
parent142d965177514ca28cd7536bb2c394485ec2c563 (diff)
Unify calloc (its the same thing regardless of the underlying
malloc implementation). Fix problem reported to bugtraq about problems with integer overflow that can occur during the computation of the memory region size by calloc (and similar functions) which could result in a subsequent buffer overflow. -Erik
Diffstat (limited to 'libc/stdlib/malloc/Makefile')
-rw-r--r--libc/stdlib/malloc/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/stdlib/malloc/Makefile b/libc/stdlib/malloc/Makefile
index 6d1e89186..30e5b9e2a 100644
--- a/libc/stdlib/malloc/Makefile
+++ b/libc/stdlib/malloc/Makefile
@@ -24,8 +24,8 @@
TOPDIR=../../../
include $(TOPDIR)Rules.mak
-CSRC = malloc.o free.o realloc.o calloc.o heap_alloc.o \
- heap_alloc_at.o heap_free.o
+CSRC = malloc.o free.o realloc.o heap_alloc.o \
+ heap_alloc_at.o heap_free.o ../malloc-930716/calloc.o
COBJS=$(patsubst %.c,%.o, $(CSRC))
OBJS=$(COBJS)