diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-06-21 15:31:21 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-06-21 15:31:21 -0400 |
| commit | 3cdce9bf24ebac1c48b30955910a8f6b36797cb5 (patch) | |
| tree | 5f731c4237dfe544e475c7d5f119aa2c6e8edcb8 /indra/newview/llface.cpp | |
| parent | c0e00cc61750d2b1bba3ada6622023df4725b1a4 (diff) | |
| parent | dc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff) | |
merge changes for 5.1.6-release
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 7f7d7f3dcc..06f64b7597 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1218,6 +1218,12 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, { LL_RECORD_BLOCK_TIME(FTM_FACE_GET_GEOM); llassert(verify()); + + if (volume.getNumVolumeFaces() <= f) { + LL_WARNS() << "Attempt get volume face out of range! Total Faces: " << volume.getNumVolumeFaces() << " Attempt get access to: " << f << LL_ENDL; + return FALSE; + } + const LLVolumeFace &vf = volume.getVolumeFace(f); S32 num_vertices = (S32)vf.mNumVertices; S32 num_indices = (S32) vf.mNumIndices; |