svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release

1 files changed, 9 insertions, 1 deletions

diff --git a/indra/newview/llpatchvertexarray.cpp b/indra/newview/llpatchvertexarray.cpp
index 62f8ac87bb..0278ba32f8 100644
--- a/indra/newview/llpatchvertexarray.cpp
+++ b/indra/newview/llpatchvertexarray.cpp
@@ -106,8 +106,16 @@ void LLPatchVertexArray::create(U32 surface_width, U32 patch_width, F32 meters_p
 		mRenderStridep = new U32 [mPatchOrder + 1];
 	}
 
+	if (NULL == mRenderLevelp || NULL == mRenderStridep)
+	{
+		// init() and some other things all want to deref these
+		// pointers, so this is serious.
+		llerrs << "mRenderLevelp or mRenderStridep was NULL; we'd crash soon." << llendl;
+		return;
+	}
 
-	// Now that we've allocated memory, we can initialize the arrays...
+	// Now that we've allocated memory, we can initialize
+	// the arrays...
 	init();
 }