From ef6937e69e8ee3f409cf9d460d5ad300a65d5924 Mon Sep 17 00:00:00 2001 From: sschirm Date: Fri, 23 Dec 2016 14:20:36 +0100 Subject: PhysX 3.4 / APEX 1.4 release candidate @21506124 --- .../Source/PhysXExtensions/src/serialization/Xml/SnRepXUpgrader.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnRepXUpgrader.cpp') diff --git a/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnRepXUpgrader.cpp b/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnRepXUpgrader.cpp index 5eb2f40e..4aadb648 100644 --- a/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnRepXUpgrader.cpp +++ b/PhysX_3.4/Source/PhysXExtensions/src/serialization/Xml/SnRepXUpgrader.cpp @@ -27,6 +27,7 @@ // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. +#include "foundation/PxMemory.h" #include "CmPhysXCommon.h" #include "SnXmlImpl.h" #include "SnXmlReader.h" @@ -102,7 +103,7 @@ namespace physx { namespace Sn { { const char *period = nextPeriod( str ); size_t len = size_t(PxMin( period - str, ptrdiff_t(1023) )); //can't be too careful these days. - memcpy( nameBuffer, str, len ); + PxMemCopy( nameBuffer, str, PxU32(len) ); nameBuffer[len] = 0; if ( theReader.gotoChild( nameBuffer ) == false ) { @@ -138,7 +139,7 @@ namespace physx { namespace Sn { if ( periodPtr == NULL || *periodPtr != '.' ) continue; nameLen = size_t(periodPtr - item.name); char* newMem = reinterpret_cast(alloc.allocate( PxU32(nameLen + 1) )); - memcpy( newMem, item.name, nameLen ); + PxMemCopy( newMem, item.name, PxU32(nameLen) ); newMem[nameLen] = 0; if ( nameOffsets.find( newMem ) ) -- cgit v1.2.3