Second Life viewer sources 1.15.1.3

1 files changed, 29 insertions, 3 deletions

diff --git a/linden/indra/newview/llpolymesh.cpp b/linden/indra/newview/llpolymesh.cpp
index cf94142..1edb8f5 100644
--- a/linden/indra/newview/llpolymesh.cpp
+++ b/linden/indra/newview/llpolymesh.cpp
@@ -301,6 +301,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                 if (numRead != 1)
                 {
                         llerrs << "can't read HasWeights flag from " << fileName << llendl;
+                        return FALSE;
                 }
                 if (!isLOD())
                 {
@@ -315,6 +316,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                 if (numRead != 1)
                 {
                         llerrs << "can't read HasDetailTexCoords flag from " << fileName << llendl;
+                        return FALSE;
                 }
 
                 //----------------------------------------------------------------
@@ -326,6 +328,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                 if (numRead != 3)
                 {
                         llerrs << "can't read Position from " << fileName << llendl;
+                        return FALSE;
                 }
                 setPosition( position );
 
@@ -338,6 +341,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                 if (numRead != 3)
                 {
                         llerrs << "can't read RotationAngles from " << fileName << llendl;
+                        return FALSE;
                 }
 
                 U8 rotationOrder;
@@ -346,6 +350,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                 if (numRead != 1)
                 {
                         llerrs << "can't read RotationOrder from " << fileName << llendl;
+                        return FALSE;
                 }
 
                 rotationOrder = 0;
@@ -364,6 +369,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                 if (numRead != 3)
                 {
                         llerrs << "can't read Scale from " << fileName << llendl;
+                        return FALSE;
                 }
                 setScale( scale );
 
@@ -384,6 +390,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                         if (numRead != 1)
                         {
                                 llerrs << "can't read NumVertices from " << fileName << llendl;
+                                return FALSE;
                         }
 
                         allocateVertexData( numVertices );      
@@ -396,6 +403,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                         if (numRead != numVertices)
                         {
                                 llerrs << "can't read Coordinates from " << fileName << llendl;
+                                return FALSE;
                         }
 
                         //----------------------------------------------------------------
@@ -406,6 +414,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                         if (numRead != numVertices)
                         {
                                 llerrs << " can't read Normals from " << fileName << llendl;
+                                return FALSE;
                         }
 
                         //----------------------------------------------------------------
@@ -416,6 +425,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                         if (numRead != numVertices)
                         {
                                 llerrs << " can't read Binormals from " << fileName << llendl;
+                                return FALSE;
                         }
 
 
@@ -427,6 +437,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                         if (numRead != numVertices)
                         {
                                 llerrs << "can't read TexCoords from " << fileName << llendl;
+                                return FALSE;
                         }
 
                         //----------------------------------------------------------------
@@ -439,6 +450,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                                 if (numRead != numVertices)
                                 {
                                         llerrs << "can't read DetailTexCoords from " << fileName << llendl;
+                                        return FALSE;
                                 }
                         }
 
@@ -452,6 +464,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                                 if (numRead != numVertices)
                                 {
                                         llerrs << "can't read Weights from " << fileName << llendl;
+                                        return FALSE;
                                 }
                         }
                 }
@@ -465,6 +478,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                 if (numRead != 1)
                 {
                         llerrs << "can't read NumFaces from " << fileName << llendl;
+                        return FALSE;
                 }
                 allocateFaceData( numFaces );
 
@@ -482,6 +496,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                         if (numRead != 3)
                         {
                                 llerrs << "can't read Face[" << i << "] from " << fileName << llendl;
+                                return FALSE;
                         }
                         if (mReferenceData)
                         {
@@ -538,6 +553,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                                 if (numRead != 1)
                                 {
                                         llerrs << "can't read NumSkinJoints from " << fileName << llendl;
+                                        return FALSE;
                                 }
                                 allocateJointNames( numSkinJoints );
                         }
@@ -547,11 +563,13 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                         //----------------------------------------------------------------
                         for (i=0; i < numSkinJoints; i++)
                         {
-                                char jointName[64];             /*Flawfinder: ignore*/
-                                numRead = fread(jointName, sizeof(jointName), 1, fp);
+                                char jointName[64+1];
+                                numRead = fread(jointName, sizeof(jointName)-1, 1, fp);
+                                jointName[sizeof(jointName)-1] = '\0'; // ensure nul-termination
                                 if (numRead != 1)
                                 {
                                         llerrs << "can't read Skin[" << i << "].Name from " << fileName << llendl;
+                                        return FALSE;
                                 }
 
                                 std::string *jn = &mJointNames[i];
@@ -561,7 +579,8 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                         //-------------------------------------------------------------------------
                         // look for morph section
                         //-------------------------------------------------------------------------
-                        char morphName[64];             /*Flawfinder: ignore*/
+                        char morphName[64+1];
+                        morphName[sizeof(morphName)-1] = '\0'; // ensure nul-termination
                         while(fread(&morphName, sizeof(char), 64, fp) == 64)
                         {
                                 if (!strcmp(morphName, "End Morphs"))
@@ -991,6 +1010,13 @@ BOOL LLPolySkeletalDistortionInfo::parseXml(LLXmlTreeNode* node)
 
         LLXmlTreeNode* skeletalParam = node->getChildByName("param_skeleton");
 
+        if (NULL == skeletalParam)
+        {
+                llwarns << "Failed to getChildByName(\"param_skeleton\")"
+                        << llendl;
+                return FALSE;
+        }
+
         for( LLXmlTreeNode* bone = skeletalParam->getFirstChild(); bone; bone = skeletalParam->getNextChild() )
         {
                 if (bone->hasName("bone"))