--- xnu/xnu-792.10.96/libkern/c++/OSRuntime.cpp
+++ xnu/xnu-201.5/libkern/c++/OSRuntime.cpp
@@ -44,6 +44,13 @@
 extern int debug_iomalloc_size;
 #endif
 
+#define	MDECL(reqlen)					\
+typedef union {						\
+	struct	_mhead hdr;				\
+	char	_m[(reqlen) + sizeof (struct _mhead)];	\
+} hdr_t;						\
+hdr_t
+
 struct _mhead {
 	size_t	mlen;
 	char	dat[0];
@@ -52,13 +59,13 @@
 void *kern_os_malloc(
 	size_t		size)
 {
-	struct _mhead	*mem;
-	size_t		memsize = sizeof (*mem) + size ;
+	MDECL(size)	*mem;
+	size_t		memsize = sizeof (*mem);
 
 	if (size == 0)
 		return (0);
 
-	mem = (struct _mhead *)kalloc(memsize);
+	mem = (hdr_t *)kalloc(memsize);
 	if (!mem)
 		return (0);
 
@@ -66,10 +73,10 @@
 	debug_iomalloc_size += memsize;
 #endif
 
-	mem->mlen = memsize;
-	bzero( mem->dat, size);
-
-	return  (mem->dat);
+	mem->hdr.mlen = memsize;
+	(void) memset(mem->hdr.dat, 0, size);
+
+	return  (mem->hdr.dat);
 }
 
 void kern_os_free(
@@ -89,7 +96,7 @@
 #if 0
 	memset((vm_offset_t)hdr, 0xbb, hdr->mlen);
 #else
-	kfree(hdr, hdr->mlen);
+	kfree((vm_offset_t)hdr, hdr->mlen);
 #endif
 }
 
@@ -98,7 +105,7 @@
 	size_t		nsize)
 {
 	struct _mhead	*ohdr;
-	struct _mhead	*nmem;
+	MDECL(nsize)	*nmem;
 	size_t		nmemsize, osize;
 
 	if (!addr)
@@ -114,8 +121,8 @@
 		return (0);
 	}
 
-	nmemsize = sizeof (*nmem) + nsize ;
-	nmem = (struct _mhead *) kalloc(nmemsize);
+	nmemsize = sizeof (*nmem);
+	nmem = (hdr_t *) kalloc(nmemsize);
 	if (!nmem){
 		kern_os_free(addr);
 		return (0);
@@ -125,14 +132,14 @@
 	debug_iomalloc_size += (nmemsize - ohdr->mlen);
 #endif
 
-	nmem->mlen = nmemsize;
+	nmem->hdr.mlen = nmemsize;
 	if (nsize > osize)
-		(void) memset(&nmem->dat[osize], 0, nsize - osize);
-	(void) memcpy(nmem->dat, ohdr->dat,
+		(void) memset(&nmem->hdr.dat[osize], 0, nsize - osize);
+	(void) memcpy(nmem->hdr.dat, ohdr->dat,
 					(nsize > osize) ? osize : nsize);
-	kfree(ohdr, ohdr->mlen);
-
-	return (nmem->dat);
+	kfree((vm_offset_t)ohdr, ohdr->mlen);
+
+	return (nmem->hdr.dat);
 }
 
 size_t kern_os_malloc_size(
@@ -147,19 +154,11 @@
 	return( hdr->mlen - sizeof (struct _mhead));
 }
 
-#if __GNUC__ >= 3
-void __cxa_pure_virtual( void )	{ panic(__FUNCTION__); }
-#else
 void __pure_virtual( void )	{ panic(__FUNCTION__); }
-#endif
 
 typedef void (*structor_t)(void);
 
-// Given a pointer to a 32 bit mach object segment, iterate the segment to
-// obtain a 32 bit destructor section for C++ objects, and call each of the
-// destructors there.
-void
-OSRuntimeUnloadCPPForSegment(struct segment_command * segment) {
+void OSRuntimeUnloadCPPForSegment(struct segment_command * segment) {
 
     struct section * section;
 
@@ -183,7 +182,6 @@
     return;
 }
 
-// This function will only operate on 32 bit kmods
 void OSRuntimeUnloadCPP(kmod_info_t *ki, void *)
 {
     if (ki && ki->address) {
@@ -226,7 +224,6 @@
 }
 
 // Functions used by the extenTools/kmod library project
-// This function will only operate on 32 bit kmods
 kern_return_t OSRuntimeInitializeCPP(kmod_info_t *ki, void *)
 {
     struct mach_header *header;
@@ -334,6 +331,8 @@
     void * result;
 
     result = (void *) kern_os_malloc( size);
+    if( result)
+	bzero( result, size);
     return( result);
 }