diff options
author | Rye <rye@lindenlab.com> | 2025-01-23 18:40:19 -0500 |
---|---|---|
committer | Rye <rye@lindenlab.com> | 2025-01-23 18:40:19 -0500 |
commit | 4763195e186f8c56c2ee92d4e0154c95aa011997 (patch) | |
tree | dc1f37243597961c9389746fb0a12bb8c8e5d71c /indra/newview/gltfscenemanager.cpp | |
parent | 4ff56cfac8e3aaf1459c656306e2c18e7f63eaeb (diff) |
Fix potential undefined behavior when converting to and from glm types from LLVector3/4 and fall back mul_mat4_vec3 to scalar implementation to attempt crash mitigation (#3339)
Diffstat (limited to 'indra/newview/gltfscenemanager.cpp')
-rw-r--r-- | indra/newview/gltfscenemanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/gltfscenemanager.cpp b/indra/newview/gltfscenemanager.cpp index ed66753267..2d6d9a153e 100644 --- a/indra/newview/gltfscenemanager.cpp +++ b/indra/newview/gltfscenemanager.cpp @@ -975,9 +975,9 @@ void renderAssetDebug(LLViewerObject* obj, Asset* asset) LLVector4a t; agent_to_asset.affineTransform(gDebugRaycastStart, t); - start = glm::make_vec4(t.getF32ptr()); + start = vec4(t); agent_to_asset.affineTransform(gDebugRaycastEnd, t); - end = glm::make_vec4(t.getF32ptr()); + end = vec4(t); start.w = end.w = 1.0; |