Merged in CodeCodon/client-tools (pull request #1)

Fix memory leaks - more cppcheck found issues in related issue report

src/engine/client/library/clientGame/src/shared/core/Game.cpp

@@ -2114,6 +2114,8 @@ void verifyUpdateRanges (const char* const filename)
 		delete appearance;
 		objectTemplate->releaseReference ();
 	}
+	
+	fclose(infile);
 }
 
 #include <deque>

src/engine/shared/library/sharedFile/src/shared/FileManifest.cpp

@@ -281,6 +281,7 @@ void FileManifest::addNewManifestEntry(const char *fileName, int fileSize)
 		// delete the new entry we created
 		delete entry;
 	}
+	delete entry;
 #else
 	return;
 #endif
@@ -299,9 +300,7 @@ void FileManifest::addStoredManifestEntry(const char *fileName, const char * sce
 
 	std::pair<ManifestMap::iterator, bool> insertReturn = s_manifest.insert(std::pair<const uint32, FileManifestEntry*>(crc, entry));
 
-	// if the insert failed, delete the entry we created
-	if (!insertReturn.second)
-		delete entry;
+	delete entry;
 }
 
 // -----------------------------------------------------------------------

src/engine/shared/library/sharedImage/src/shared/TargaFormat.cpp

@@ -1198,6 +1198,7 @@ bool TargaFormat::saveImage(const Image &image, const char *filename)
    if (numWritten != 1)
    {
 		DEBUG_WARNING(true, ("Targa header not written successfully.\n"));
+		fclose(f);
       return false;
    }
 	//------------------------------------------

src/engine/shared/library/sharedMath/src/shared/PaletteArgb.cpp

@@ -264,6 +264,7 @@ bool PaletteArgb::write(const char *pathName) const
 	if (unitsWritten != 1)
 	{
 		WARNING(true, ("failed to write palette data (%d bytes) to file [%s].", numberOfBytesWritten, pathName));
+		fclose(file);
 		return false;
 	}
 

src/engine/shared/library/sharedMath/src/shared/PolySolver.cpp

@@ -9,90 +9,90 @@
 #define M_PI          3.14159265358979323846
 #endif
 
-double cuberoot( double x )
+double cuberoot(double x)
 {
-	return ((x) > 0.0 ? pow(x, 1.0/3.0) : ((x) < 0.0 ? -pow(-x, 1.0/3.0) : 0.0));
+	return ((x) > 0.0 ? pow(x, 1.0 / 3.0) : ((x) < 0.0 ? -pow(-x, 1.0 / 3.0) : 0.0));
 }
 
-int PolySolver::solveQuadratic( double const c[3], double s[2] )
+int PolySolver::solveQuadratic(double const c[3], double s[2])
 {
-    double p, q, D;
+	double p, q, D;
 
-    /* normal form: x^2 + px + q = 0 */
+	/* normal form: x^2 + px + q = 0 */
 
-    p = c[ 1 ] / (2 * c[ 2 ]);
-    q = c[ 0 ] / c[ 2 ];
+	p = c[1] / (2 * c[2]);
+	q = c[0] / c[2];
 
-    D = p * p - q;
+	D = p * p - q;
 
-    if (D < 0)
-    {
+	if (D < 0)
+	{
 		return 0;
-    }
-    else
-    {
+	}
+	else
+	{
 		double sqrt_D = sqrt(D);
 
-		s[ 0 ] =   sqrt_D - p;
-		s[ 1 ] = - sqrt_D - p;
+		s[0] = sqrt_D - p;
+		s[1] = -sqrt_D - p;
 		return 2;
-    }
+	}
 }
 
-int PolySolver::solveCubic( double const c[4], double s[3] )
+int PolySolver::solveCubic(double const c[4], double s[3])
 {
-    int     i, num;
-    double  sub;
-    double  A, B, C;
-    double  sq_A, p, q;
-    double  cb_p, D;
+	int     i, num;
+	double  sub;
+	double  A, B, C;
+	double  sq_A, p, q;
+	double  cb_p, D;
 
-    /* normal form: x^3 + Ax^2 + Bx + C = 0 */
+	/* normal form: x^3 + Ax^2 + Bx + C = 0 */
 
-    A = c[ 2 ] / c[ 3 ];
-    B = c[ 1 ] / c[ 3 ];
-    C = c[ 0 ] / c[ 3 ];
+	A = c[2] / c[3];
+	B = c[1] / c[3];
+	C = c[0] / c[3];
 
-    /*  substitute x = y - A/3 to eliminate quadric term:
+	/*  substitute x = y - A/3 to eliminate quadric term:
 	x^3 +px + q = 0 */
 
-    sq_A = A * A;
-    p = (1.0/3) * (- (1.0/3) * sq_A + B);
-    q = (1.0/2) * (((2.0/27) * A * sq_A - ((1.0/3) * A * B)) + C);
+	sq_A = A * A;
+	p = (1.0 / 3) * (-(1.0 / 3) * sq_A + B);
+	q = (1.0 / 2) * (((2.0 / 27) * A * sq_A - ((1.0 / 3) * A * B)) + C);
 
-    /* use Cardano's formula */
+	/* use Cardano's formula */
 
-    cb_p = p * p * p;
-    D = q * q + cb_p;
+	cb_p = p * p * p;
+	D = q * q + cb_p;
 
-    if (D < 0) /* Casus irreducibilis: three real solutions */
-    {
-		double phi = (1.0/3) * acos(-q / sqrt(-cb_p));
+	if (D < 0) /* Casus irreducibilis: three real solutions */
+	{
+		double phi = (1.0 / 3) * acos(-q / sqrt(-cb_p));
 		double t = 2 * sqrt(-p);
 
-		s[ 0 ] =   t * cos(phi);
-		s[ 1 ] = - t * cos(phi + M_PI / 3);
-		s[ 2 ] = - t * cos(phi - M_PI / 3);
+		s[0] = t * cos(phi);
+		s[1] = -t * cos(phi + M_PI / 3);
+		s[2] = -t * cos(phi - M_PI / 3);
 		num = 3;
-    }
-    else /* one real solution */
-    {
+	}
+	else /* one real solution */
+	{
 		double sqrt_D = sqrt(D);
 		double u = cuberoot(sqrt_D - q);
-		double v = - cuberoot(sqrt_D + q);
+		double v = -cuberoot(sqrt_D + q);
 
-		s[ 0 ] = u + v;
+		s[0] = u + v;
 		num = 1;
-    }
+	}
 
-    /* resubstitute */
+	/* resubstitute */
 
-    sub = (1.0/3) * A;
+	sub = (1.0 / 3) * A;
 
-    for (i = 0; i < num; ++i)
-    	s[ i ] -= sub;
+	for (i = 0; i < num; ++i)
+		s[i] -= sub;
 
-    return num;
+	return num;
 }
 
 double cubicError = 0.0f;
@@ -101,97 +101,97 @@ double cleanedCubicError = 0.0f;
 double quarticError = 0.0f;
 double cleanedQuarticError = 0.0f;
 
-double evaluateCubic( double x, const double c[4] )
+double evaluateCubic(double x, const double c[4])
 {
 	return ((x*c[3] + c[2]) * x + c[1]) * x + c[0];
 }
 
-double evaluateCubicDerivative ( double x, const double c[4] )
+double evaluateCubicDerivative(double x, const double c[4])
 {
 	return (3.0*x + 2.0*c[2]) * x + c[1];
 }
 
-double cleanCubicRoot( double x, const double c[4] )
+double cleanCubicRoot(double x, const double c[4])
 {
 	double e;
 
-	e = evaluateCubic(x,c);
+	e = evaluateCubic(x, c);
 
-	if(fabs(e) > cubicError) cubicError = e;
+	if (fabs(e) > cubicError) cubicError = e;
 
 	// ----------
 
-//	for(int i = 0; i < 10; i++)
+	//	for(int i = 0; i < 10; i++)
 	{
-		e = evaluateCubic(x,c);
+		e = evaluateCubic(x, c);
 
 		e *= 0.8;
 
-		double d = evaluateCubicDerivative(x,c);
+		double d = evaluateCubicDerivative(x, c);
 
-		if(d != 0.0)
+		if (d != 0.0)
 		{
-			x = x - e/d;
+			x = x - e / d;
 		}
 	}
 
 	// ----------
-	
-	e = evaluateCubic(x,c);
 
-	if(fabs(e) > cleanedCubicError) cleanedCubicError = e;
+	e = evaluateCubic(x, c);
+
+	if (fabs(e) > cleanedCubicError) cleanedCubicError = e;
 
 	return x;
 }
 
-double evaluateQuartic( double x, const double c[5] )
+double evaluateQuartic(double x, const double c[5])
 {
 	return (((x*c[4] + c[3]) * x + c[2]) * x + c[1]) * x + c[0];
 }
 
-double evaluateQuarticDerivative ( double x, const double c[5] )
+double evaluateQuarticDerivative(double x, const double c[5])
 {
 	return ((4.0*x*c[4] + 3.0*c[3]) * x + 2.0*c[2]) * x + c[1];
 }
 
-double cleanQuarticRoot( double x, const double c[4] )
+double cleanQuarticRoot(double x, const double c[5])
 {
 	double e;
 
-	e = evaluateQuartic(x,c);
+	e = evaluateQuartic(x, c);
 
-	if(fabs(e) > quarticError) quarticError = e;
+	if (fabs(e) > quarticError) quarticError = e;
 
 	// ----------
 
-//	for(int i = 0; i < 10; i++)
+	//	for(int i = 0; i < 10; i++)
 	{
-		e = evaluateQuartic(x,c);
+		e = evaluateQuartic(x, c);
 
 		e *= 0.8;
 
-		double d = evaluateQuarticDerivative(x,c);
+		double d = evaluateQuarticDerivative(x, c);
 
-		if(d != 0.0)
+		if (d != 0.0)
 		{
-			x = x - e/d;
+			x = x - e / d;
 		}
 	}
 
 	// ----------
 
-	e = evaluateQuartic(x,c);
+	e = evaluateQuartic(x, c);
 
-	if(fabs(e) > cleanedQuarticError) cleanedQuarticError = e;
+	if (fabs(e) > cleanedQuarticError) cleanedQuarticError = e;
 
 	return x;
 }
 
 #ifdef WIN32
-	#define isnan(a) _isnan(a)
+#define isnan(a) _isnan(a)
 #endif
 
-int PolySolver::solveQuartic( const double c[5], double s[4] )
+int PolySolver::solveQuartic(const double c[5], double s[4])
 {
 	double a3 = c[3] / c[4];
 	double a2 = c[2] / c[4];
@@ -213,15 +213,15 @@ int PolySolver::solveQuartic( const double c[5], double s[4] )
 
 		double s[3];
 
-		int nRoots = PolySolver::solveCubic(c,s);
+		int nRoots = PolySolver::solveCubic(c, s);
 
-		for(int i = 0; i < nRoots; i++)
+		for (int i = 0; i < nRoots; i++)
 		{
-			if(s[i] == s[i])
+			if (s[i] == s[i])
 			{
 				// root is real
 
-				y1 = cleanCubicRoot( s[i], c );
+				y1 = cleanCubicRoot(s[i], c);
 
 				break;
 			}
@@ -230,53 +230,53 @@ int PolySolver::solveQuartic( const double c[5], double s[4] )
 
 	// ----------
 	// use the root to find the roots of the quadric
-	
-	double t1 = (1.0/4.0)*(a3*a3) - a2 + y1;
+
+	double t1 = (1.0 / 4.0)*(a3*a3) - a2 + y1;
 
 	double R = sqrt(t1);
 
 	double D;
 
-	if(R == 0.0)
+	if (R == 0.0)
 	{
 		double t1 = (y1*y1) - (4.0)*(a0);
 
 		double t2 = sqrt(t1);
 
-		double t3 = (3.0/4.0)*(a3*a3) - (2.0)*(a2) + (2.0)*t2;
+		double t3 = (3.0 / 4.0)*(a3*a3) - (2.0)*(a2)+(2.0)*t2;
 
 		D = sqrt(t3);
 	}
 	else
 	{
-		double t1 = (4.0)*(a3*a2) - (8.0)*(a1) - (a3*a3*a3);
+		double t1 = (4.0)*(a3*a2) - (8.0)*(a1)-(a3*a3*a3);
 
 		double t2 = t1 / (4.0 * R);
 
-		double t3 = (3.0/4.0)*(a3*a3) - (R*R) - (2.0)*(a2) + t2;
+		double t3 = (3.0 / 4.0)*(a3*a3) - (R*R) - (2.0)*(a2)+t2;
 
 		D = sqrt(t3);
 	}
-	
+
 	double E;
 
-	if(R == 0.0)
+	if (R == 0.0)
 	{
 		double t1 = (y1*y1) - (4.0)*(a0);
 
 		double t2 = sqrt(t1);
 
-		double t3 = (3.0/4.0)*(a3*a3) - (2.0)*(a2) - (2.0)*(t2);
+		double t3 = (3.0 / 4.0)*(a3*a3) - (2.0)*(a2)-(2.0)*(t2);
 
 		E = sqrt(t3);
 	}
 	else
 	{
-		double t1 = (4.0)*(a3*a2) - (8.0)*(a1) - (a3*a3*a3);
+		double t1 = (4.0)*(a3*a2) - (8.0)*(a1)-(a3*a3*a3);
 
 		double t2 = t1 / (4.0 * R);
 
-		double t3 = (3.0/4.0)*(a3*a3) - (R*R) - (2.0)*(a2) - t2;
+		double t3 = (3.0 / 4.0)*(a3*a3) - (R*R) - (2.0)*(a2)-t2;
 
 		E = sqrt(t3);
 	}
@@ -289,8 +289,8 @@ int PolySolver::solveQuartic( const double c[5], double s[4] )
 	}
 	else
 	{
-		s[0] = (-1.0/4.0)*a3 + (1.0/2.0)*R + (1.0/2.0)*D;
-		s[1] = (-1.0/4.0)*a3 + (1.0/2.0)*R - (1.0/2.0)*D;
+		s[0] = (-1.0 / 4.0)*a3 + (1.0 / 2.0)*R + (1.0 / 2.0)*D;
+		s[1] = (-1.0 / 4.0)*a3 + (1.0 / 2.0)*R - (1.0 / 2.0)*D;
 	}
 
 	if (isnan(E))
@@ -300,18 +300,18 @@ int PolySolver::solveQuartic( const double c[5], double s[4] )
 	}
 	else
 	{
-		s[2] = (-1.0/4.0)*a3 - (1.0/2.0)*R + (1.0/2.0)*E;
-		s[3] = (-1.0/4.0)*a3 - (1.0/2.0)*R - (1.0/2.0)*E;
+		s[2] = (-1.0 / 4.0)*a3 - (1.0 / 2.0)*R + (1.0 / 2.0)*E;
+		s[3] = (-1.0 / 4.0)*a3 - (1.0 / 2.0)*R - (1.0 / 2.0)*E;
 	}
 
-/*
+	/*
 	// Perform one step of a Newton iteration in order to minimize round-off errors
 
 	int i;
 
 	for(i = 0; i < 4; i++)
 	{
-		s[i] = cleanQuarticRoot(s[i],c);
+	s[i] = cleanQuarticRoot(s[i],c);
 	}
 	*/
 

src/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp

@@ -180,9 +180,14 @@ int File::readLine(char *buffer, int bufferSize)
 int File::print(const char *format, ...)
 {
 	NOT_NULL(m_fp);
+	int resultChars = 0;
 
 	va_list argptr;
 	va_start(argptr, format);
 
-	return vfprintf(m_fp, format, argptr);
+	resultChars = vfprintf(m_fp, format, argptr);
+	
+	va_end(argptr);
+
+	return resultChars;
 }	// File::print

src/external/3rd/library/platform/utils/Base/Config.cpp

@@ -31,6 +31,7 @@ bool CConfig::LoadFile(char * file)
 	if (fp == NULL || fp == (FILE *)-1)
 	{
 		//fprintf(stderr,"Failed to open config file %s!",file);
+		fclose(fp);
 		return false;
 	}
 

src/external/3rd/library/soePlatform/Base/Config.cpp

@@ -27,6 +27,7 @@ bool CConfig::LoadFile(char * file)
 	if (fp == NULL || fp == (FILE *)-1)
 	{
 		//fprintf(stderr,"Failed to open config file %s!",file);
+		fclose(fp);
 		return false;
 	}
 

src/external/3rd/library/soePlatform/CSAssist/utils/Base/Config.cpp

@@ -31,6 +31,7 @@ bool CConfig::LoadFile(char * file)
 	if (fp == NULL || fp == (FILE *)-1)
 	{
 		//fprintf(stderr,"Failed to open config file %s!",file);
+		fclose(fp);
 		return false;
 	}
 

src/external/3rd/library/soePlatform/ChatAPI2/ChatAPI/utils/Base/Config.cpp

@@ -31,6 +31,7 @@ bool CConfig::LoadFile(char * file)
 	if (fp == NULL || fp == (FILE *)-1)
 	{
 		//fprintf(stderr,"Failed to open config file %s!",file);
+		fclose(fp);
 		return false;
 	}
 

src/game/client/application/SwgClientSetup/src/win32/SwgClientSetup.cpp

@@ -386,6 +386,7 @@ BOOL SwgClientSetupApp::InitInstance()
 		CString anotherStr;
 		VERIFY(anotherStr.LoadString(IDS_ANOTHER_INSTANCE));
 		MessageBox(NULL, anotherStr, NULL, MB_OK | MB_ICONSTOP);
+		CloseHandle(semaphore);
 		return FALSE;
 	}
 	

src/game/client/library/swgClientUserInterface/src/shared/parser/SwgCuiCommandParserScene.cpp

@@ -691,6 +691,7 @@ static void PlayAnimation (const SwgCuiCommandParserScene::StringVector_t & argv
 				messageBuffer[sizeof(messageBuffer) - 1] = '\0';
 
 				result = Unicode::narrowToWide(messageBuffer);
+				fclose(indirectionFile);
 				return;
 			}
 		}

src/game/server/application/SwgGameServer/src/win32/WinMain.cpp

@@ -283,6 +283,8 @@ void verifyUpdateRanges (const char* const filename)
 		DEBUG_REPORT_LOG (true, ("OK:\t%s\t%s\t%1.1f\n", serverObjectTemplateName, sharedObjectTemplateName.c_str (), farUpdateRange));
 		objectTemplate->releaseReference ();
 	}
+
+	fclose(infile);
 }
 
 static std::string currentLintedAsset;