From 415966341508776791ec223de5546aa5b8bb4c97 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Fri, 20 Jan 2012 23:16:17 -0800 Subject: [PATCH] Get rid of MEMDUP() macro. --- Sources/Plasma/CoreLib/hsMalloc.h | 1 - Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.h | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/Plasma/CoreLib/hsMalloc.h b/Sources/Plasma/CoreLib/hsMalloc.h index a7b64a1f..0cdb2e40 100644 --- a/Sources/Plasma/CoreLib/hsMalloc.h +++ b/Sources/Plasma/CoreLib/hsMalloc.h @@ -167,7 +167,6 @@ inline void CDECL operator delete (void *, void *) {} #define ALLOC(b) MemAlloc(b, 0, __FILE__, __LINE__) #define ALLOCZERO(b) MemAlloc(b, kMemZero, __FILE__, __LINE__) #define ALLOCFLAGS(b, f) MemAlloc(b, (f), __FILE__, __LINE__) -#define MEMDUP(s, b) MemDup(s, b, 0, __FILE__, __LINE__) #define ZERO(s) MemSet(&s, 0, sizeof(s)) #define ZEROPTR(p) MemSet(p, 0, sizeof(*p)) diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.h b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.h index a1da7276..d14bb3a0 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.h +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.h @@ -384,7 +384,8 @@ inline void IVaultNodeSetBlob ( ) { free(*pdst); if (src) { - *pdst = (uint8_t*)MEMDUP(src, srcLen); + *pdst = (uint8_t*)malloc(srcLen); + memcpy(*pdst, src, srcLen); *pdstLen = srcLen; } else {