1 files changed, 71 insertions, 21 deletions

diff --git a/contrib/ntp/libntp/emalloc.c b/contrib/ntp/libntp/emalloc.c
index 2fe4c38..6c1c678 100644
--- a/contrib/ntp/libntp/emalloc.c
+++ b/contrib/ntp/libntp/emalloc.c
@@ -1,48 +1,98 @@
 /*
  * emalloc - return new memory obtained from the system.  Belch if none.
  */
+#include <config.h>
 #include "ntp_types.h"
 #include "ntp_malloc.h"
 #include "ntp_syslog.h"
 #include "ntp_stdlib.h"
 
-#if defined SYS_WINNT && defined DEBUG
-#include <crtdbg.h>
-#endif
 
-#if defined SYS_WINNT && defined DEBUG
+/*
+ * When using the debug MS CRT allocator, each allocation stores the
+ * callsite __FILE__ and __LINE__, which is then displayed at process
+ * termination, to track down leaks.  We don't want all of our
+ * allocations to show up as coming from emalloc.c, so we preserve the
+ * original callsite's source file and line using macros which pass
+ * __FILE__ and __LINE__ as parameters to these routines.
+ * Other debug malloc implementations can be used by defining
+ * EREALLOC_IMPL() as ports/winnt/include/config.h does.
+ */
 
 void *
-debug_emalloc(
-	u_int size,
-	char *filename,
-	int line
+ereallocz(
+	void *	ptr,
+	size_t	newsz,
+	size_t	priorsz,
+	int	zero_init
+#ifdef EREALLOC_CALLSITE		/* ntp_malloc.h */
+			 ,
+	const char *	file,
+	int		line
+#endif
 	)
 {
-	char *mem;
+	char *	mem;
+	size_t	allocsz;
+
+	if (0 == newsz)
+		allocsz = 1;
+	else
+		allocsz = newsz;
 
-	if ((mem = (char *)_malloc_dbg(size, _NORMAL_BLOCK, filename, line)) == 0) {
-		msyslog(LOG_ERR, "Exiting: No more memory!");
+	mem = EREALLOC_IMPL(ptr, allocsz, file, line);
+	if (NULL == mem) {
+		msyslog_term = TRUE;
+#ifndef EREALLOC_CALLSITE
+		msyslog(LOG_ERR, "fatal out of memory (%lu bytes)",
+			(u_long)newsz);
+#else
+		msyslog(LOG_ERR,
+			"fatal out of memory %s line %d (%lu bytes)",
+			file, line, (u_long)newsz);
+#endif
 		exit(1);
 	}
+
+	if (zero_init && newsz > priorsz)
+		zero_mem(mem + priorsz, newsz - priorsz);
+
 	return mem;
 }
 
-#else
 
-void *
-emalloc(
-	u_int size
+char *
+estrdup_impl(
+	const char *	str
+#ifdef EREALLOC_CALLSITE
+			   ,
+	const char *	file,
+	int		line
+#endif
 	)
 {
-	char *mem;
+	char *	copy;
+	size_t	bytes;
 
-	if ((mem = (char *)malloc(size)) == 0) {
-		msyslog(LOG_ERR, "Exiting: No more memory!");
-		exit(1);
-	}
-	return mem;
+	bytes = strlen(str) + 1;
+	copy = ereallocz(NULL, bytes, 0, FALSE
+#ifdef EREALLOC_CALLSITE
+			 , file, line
+#endif
+			 );
+	memcpy(copy, str, bytes);
+
+	return copy;
 }
 
 
+#if 0
+#ifndef EREALLOC_CALLSITE
+void *
+emalloc(size_t newsz)
+{
+	return ereallocz(NULL, newsz, 0, FALSE);
+}
 #endif
+#endif
+