From 9724a5e5b83d98e591e24b2f23110b025657a6ae Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Thu, 9 Nov 2017 10:53:36 -0800 Subject: [PATCH] Fix for address sanitizer warning This fixes a potential null pointer dereference. --- libraries/animation/src/Rig.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp index acf7bf81d8..3dad4e3fb6 100644 --- a/libraries/animation/src/Rig.cpp +++ b/libraries/animation/src/Rig.cpp @@ -303,7 +303,9 @@ void Rig::setModelOffset(const glm::mat4& modelOffsetMat) { _rigToGeometryTransform = glm::inverse(_geometryToRigTransform); // rebuild cached default poses - buildAbsoluteRigPoses(_animSkeleton->getRelativeDefaultPoses(), _absoluteDefaultPoses); + if (_animSkeleton) { + buildAbsoluteRigPoses(_animSkeleton->getRelativeDefaultPoses(), _absoluteDefaultPoses); + } } }