diff options
| author | erwincoumans <erwincoumans@google.com> | 2020-08-13 19:35:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-13 19:35:50 -0700 |
| commit | 0993c9a782f2e00bee5bb743dbeb0db0d007b31d (patch) | |
| tree | ba0f13250e77a731e6421f5b8c0aaa0805bbe39c | |
| parent | 76a9b519934d31e185339e3b961d600a6e2beb57 (diff) | |
| parent | 2197101bc568a90e7af3bdd49280d4007200aab2 (diff) | |
| download | bullet3-0993c9a782f2e00bee5bb743dbeb0db0d007b31d.tar.gz | |
Merge pull request #2855 from asmaloney/fix-pointer-check
Fix parameter check in bFile::safeSwapPtr
| -rw-r--r-- | src/Bullet3Serialize/Bullet2FileLoader/b3File.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Bullet3Serialize/Bullet2FileLoader/b3File.cpp b/src/Bullet3Serialize/Bullet2FileLoader/b3File.cpp index 145de62db..f6c779a91 100644 --- a/src/Bullet3Serialize/Bullet2FileLoader/b3File.cpp +++ b/src/Bullet3Serialize/Bullet2FileLoader/b3File.cpp @@ -851,12 +851,12 @@ void bFile::swapData(char *data, short type, int arraySize, bool ignoreEndianFla void bFile::safeSwapPtr(char *dst, const char *src) { + if (!src || !dst) + return; + int ptrFile = mFileDNA->getPointerSize(); int ptrMem = mMemoryDNA->getPointerSize(); - if (!src && !dst) - return; - if (ptrFile == ptrMem) { memcpy(dst, src, ptrMem); |