From b4d3ee3b0598f9fda08cf7aba595bf58ac48bd33 Mon Sep 17 00:00:00 2001
From: Drake Arconis <drake@alchemyviewer.org>
Date: Sat, 18 Apr 2015 22:29:23 -0400
Subject: [PATCH] Fix some coverity buggles
---
indra/llappearance/llpolymesh.cpp | 8 ++++++--
indra/llcharacter/llheadrotmotion.cpp | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/indra/llappearance/llpolymesh.cpp b/indra/llappearance/llpolymesh.cpp
index 0d0b3152eb..9a679bb78f 100644
--- a/indra/llappearance/llpolymesh.cpp
+++ b/indra/llappearance/llpolymesh.cpp
@@ -307,7 +307,11 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
//----------------------------------------------------------------
// File Header (seek past it)
//----------------------------------------------------------------
- fseek(fp, 24, SEEK_SET);
+ if (fseek(fp, 24, SEEK_SET) != 0)
+ {
+ LL_ERRS() << "can't seek past header from " << fileName << LL_ENDL;
+ return FALSE;
+ }
//----------------------------------------------------------------
// HasWeights
@@ -605,7 +609,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
//-------------------------------------------------------------------------
char morphName[64+1];
morphName[sizeof(morphName)-1] = '\0'; // ensure nul-termination
- while(fread(&morphName, sizeof(char), 64, fp) == 64)
+ while(fread(morphName, sizeof(char), 64, fp) == 64)
{
if (!strcmp(morphName, "End Morphs"))
{
diff --git a/indra/llcharacter/llheadrotmotion.cpp b/indra/llcharacter/llheadrotmotion.cpp
index 1f988bc5b1..75c08ca106 100755
--- a/indra/llcharacter/llheadrotmotion.cpp
+++ b/indra/llcharacter/llheadrotmotion.cpp
@@ -460,7 +460,7 @@ BOOL LLEyeMotion::onUpdate(F32 time, U8* joint_mask)
// calculate vergence
F32 interocular_dist = (mLeftEyeState->getJoint()->getWorldPosition() - mRightEyeState->getJoint()->getWorldPosition()).magVec();
vergence = -atan2((interocular_dist / 2.f), lookAtDistance);
- llclamp(vergence, -F_PI_BY_TWO, 0.f);
+ vergence = llclamp(vergence, -F_PI_BY_TWO, 0.f);
}
else
{
--
GitLab