summaryrefslogtreecommitdiff
path: root/indra/llprimitive/lldaeloader.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2022-02-28 21:54:21 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2022-02-28 21:54:21 +0200
commit73eec8913135127a1d31d3f1dc766f96908f984d (patch)
tree66ae3fec58046505fc80b15352957696d1ab4378 /indra/llprimitive/lldaeloader.cpp
parentce6dd53f9c364f46e30d0eedb1c6a701fbad8885 (diff)
parent6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff)
Merge branch 'master' into DRTVWR-540-maint
# Conflicts: # autobuild.xml # indra/llcommon/llsys.cpp # indra/newview/app_settings/key_bindings.xml # indra/newview/llfloatereditextdaycycle.cpp
Diffstat (limited to 'indra/llprimitive/lldaeloader.cpp')
-rw-r--r--indra/llprimitive/lldaeloader.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index dfa29fb539..33e90555fa 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -198,6 +198,17 @@ LLModel::EModelStatus load_face_from_dom_triangles(std::vector<LLVolumeFace>& fa
}
LLVolumeFace::VertexMapData::PointMap point_map;
+
+ if (idx_stride <= 0
+ || (pos_source && pos_offset >= idx_stride)
+ || (tc_source && tc_offset >= idx_stride)
+ || (norm_source && norm_offset >= idx_stride))
+ {
+ // Looks like these offsets should fit inside idx_stride
+ // Might be good idea to also check idx.getCount()%idx_stride != 0
+ LL_WARNS() << "Invalid pos_offset " << pos_offset << ", tc_offset " << tc_offset << " or norm_offset " << norm_offset << LL_ENDL;
+ return LLModel::BAD_ELEMENT;
+ }
for (U32 i = 0; i < idx.getCount(); i += idx_stride)
{