SL-17801: Don't let external code delete the raw pointer to the picking octree

4 files changed, 25 insertions, 20 deletions

diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 67c351ddd7..5de1fe5a8d 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -4146,13 +4146,13 @@ S32 LLVolume::lineSegmentIntersect(const LLVector4a& start, const LLVector4a& en
 			}
 			else
 			{
-				if (!face.mOctree)
+                if (!face.getOctree())
 				{
 					face.createOctree();
 				}
 			
 				LLOctreeTriangleRayIntersect intersect(start, dir, &face, &closest_t, intersection, tex_coord, normal, tangent_out);
-				intersect.traverse(face.mOctree);
+                intersect.traverse(face.getOctree());
 				if (intersect.mHitFace)
 				{
 					hit_face = i;
@@ -4879,10 +4879,7 @@ void LLVolumeFace::freeData()
 	mJustWeights = NULL;
 #endif
 
-	delete mOctree;
-	mOctree = NULL;
-    delete[] mOctreeTriangles;
-	mOctreeTriangles = NULL;
+    destroyOctree();
 }
 
 BOOL LLVolumeFace::create(LLVolume* volume, BOOL partial_build)
@@ -4890,10 +4887,7 @@ BOOL LLVolumeFace::create(LLVolume* volume, BOOL partial_build)
 	LL_PROFILE_ZONE_SCOPED_CATEGORY_VOLUME
 
 	//tree for this face is no longer valid
-	delete mOctree;
-	mOctree = NULL;
-    delete[] mOctreeTriangles;
-	mOctreeTriangles = NULL;
+    destroyOctree();
 
 	LL_CHECK_MEMORY
 	BOOL ret = FALSE ;
@@ -5562,7 +5556,7 @@ void LLVolumeFace::createOctree(F32 scaler, const LLVector4a& center, const LLVe
 {
 	LL_PROFILE_ZONE_SCOPED_CATEGORY_VOLUME
 
-	if (mOctree)
+    if (getOctree())
 	{
 		return;
 	}
@@ -5573,7 +5567,6 @@ void LLVolumeFace::createOctree(F32 scaler, const LLVector4a& center, const LLVe
 	new LLVolumeOctreeListener(mOctree);
     const U32 num_triangles = mNumIndices / 3;
     // Initialize all the triangles we need
-    delete[] mOctreeTriangles; // External code may delete mOctree
     mOctreeTriangles = new LLVolumeTriangle[num_triangles];
 
     for (U32 triangle_index = 0; triangle_index < num_triangles; ++triangle_index)
@@ -5636,6 +5629,19 @@ void LLVolumeFace::createOctree(F32 scaler, const LLVector4a& center, const LLVe
 	}
 }
 
+void LLVolumeFace::destroyOctree()
+{
+    delete mOctree;
+    mOctree = NULL;
+    delete[] mOctreeTriangles;
+    mOctreeTriangles = NULL;
+}
+
+const LLOctreeNode<LLVolumeTriangle, LLVolumeTriangle*>* LLVolumeFace::getOctree() const
+{
+    return mOctree;
+}
+
 
 void LLVolumeFace::swapData(LLVolumeFace& rhs)
 {
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h
index ffb02b934d..a984aa127e 100644
--- a/indra/llmath/llvolume.h
+++ b/indra/llmath/llvolume.h
@@ -907,6 +907,9 @@ public:
 	bool cacheOptimize();
 
 	void createOctree(F32 scaler = 0.25f, const LLVector4a& center = LLVector4a(0,0,0), const LLVector4a& size = LLVector4a(0.5f,0.5f,0.5f));
+    void destroyOctree();
+    // Get a reference to the octree, which may be null
+    const LLOctreeNode<LLVolumeTriangle, LLVolumeTriangle*>* getOctree() const;
 
 	enum
 	{
@@ -974,14 +977,12 @@ public:
     // Which joints are rigged to, and the bounding box of any rigged
     // vertices per joint.
     LLJointRiggingInfoTab mJointRiggingInfoTab;
-    
-    // This octree stores raw pointer references to triangles in mOctreeTriangles
-    LLOctreeNode<LLVolumeTriangle, LLVolumeTriangle*>* mOctree;
 
 	//whether or not face has been cache optimized
 	BOOL mOptimized;
 
 private:
+    LLOctreeNode<LLVolumeTriangle, LLVolumeTriangle*>* mOctree;
     LLVolumeTriangle* mOctreeTriangles;
 
 	BOOL createUnCutCubeCap(LLVolume* volume, BOOL partial_build = FALSE);
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 9cfbe99df4..42cd1133a2 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -3223,14 +3223,14 @@ void renderRaycast(LLDrawable* drawablep)
 					{
 						F32 t = 1.f;
 
-						if (!face.mOctree)
+                        if (!face.getOctree())
 						{
 							((LLVolumeFace*) &face)->createOctree(); 
 						}
 
 						LLRenderOctreeRaycast render(start, dir, &t);
 					
-						render.traverse(face.mOctree);
+                        render.traverse(face.getOctree());
 					}
 
 					gGL.popMatrix();		
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index c4b51c474d..8bf9d12b33 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -4976,9 +4976,7 @@ void LLRiggedVolume::update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, cons
 
             if (rebuild_face_octrees)
 			{
-    			delete dst_face.mOctree;
-				dst_face.mOctree = NULL;
-
+                dst_face.destroyOctree();
                 dst_face.createOctree();
 			}
 		}