From 173575e835d5e3f15991d18f3642550d8642bdb1 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Wed, 25 Mar 2015 19:07:38 -0500 Subject: [PATCH] fix some things cppcheck found...some are TODO because i don't feel like investigating them --- .../src/shared/ConsoleCommandParserGame.cpp | 2 +- .../src/shared/ConnectionServer.cpp | 5 +- .../LogServer/src/shared/LogServer.cpp | 1 + .../PlanetServer/src/shared/PlanetServer.cpp | 3 +- .../src/shared/DatabaseProcess.cpp | 3 +- .../controller/PlayerShipController.cpp | 1 + .../serverGame/src/shared/core/GameServer.cpp | 1 + .../serverScript/src/shared/JNIWrappers.cpp | 46 ++++++++++++++++++- .../sharedDebug/src/shared/Profiler.cpp | 2 +- .../sharedFile/src/shared/FileManifest.cpp | 8 ++-- .../sharedImage/src/shared/TargaFormat.cpp | 2 +- .../sharedMath/src/shared/PaletteArgb.cpp | 2 +- .../src/linux/NetworkGetHostName.cpp | 2 +- .../src/shared/core/File.cpp | 2 + .../CSAssistgameapi/CSAssistgameapicore.cpp | 6 +-- 15 files changed, 68 insertions(+), 18 deletions(-) diff --git a/engine/server/application/CentralServer/src/shared/ConsoleCommandParserGame.cpp b/engine/server/application/CentralServer/src/shared/ConsoleCommandParserGame.cpp index 3231ecff..0956464d 100644 --- a/engine/server/application/CentralServer/src/shared/ConsoleCommandParserGame.cpp +++ b/engine/server/application/CentralServer/src/shared/ConsoleCommandParserGame.cpp @@ -79,7 +79,7 @@ bool ConsoleCommandParserGame::performParsing(const NetworkId & track, const Str if(argv.size() > 2) { unsigned int pid; - sscanf(Unicode::wideToNarrow(argv[2]).c_str(), "%d", &pid); + sscanf(Unicode::wideToNarrow(argv[2]).c_str(), "%u", &pid); GameServerConnection * gameConn = CentralServer::getInstance().getGameServer(pid); if(gameConn) { diff --git a/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp b/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp index 70ef1768..286facec 100644 --- a/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp +++ b/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp @@ -1,4 +1,4 @@ - +15 // ConnectionServer.cpp // copyright 2001 Verant Interactive @@ -1577,7 +1577,8 @@ void ConnectionServer::setDone(char const *reasonfmt, ...) "ConnectionServer (pid %d) shutdown, reason: %s\n", static_cast(Os::getProcessId()), reason)); - + + va_end(ap); done = true; } } diff --git a/engine/server/application/LogServer/src/shared/LogServer.cpp b/engine/server/application/LogServer/src/shared/LogServer.cpp index f5658a39..e608ab89 100644 --- a/engine/server/application/LogServer/src/shared/LogServer.cpp +++ b/engine/server/application/LogServer/src/shared/LogServer.cpp @@ -151,6 +151,7 @@ void LogServer::setDone(char const *reasonfmt, ...) static_cast(Os::getProcessId()), reason)); + va_end(ap); m_done = true; } } diff --git a/engine/server/application/PlanetServer/src/shared/PlanetServer.cpp b/engine/server/application/PlanetServer/src/shared/PlanetServer.cpp index a1714f6f..c1dbd871 100644 --- a/engine/server/application/PlanetServer/src/shared/PlanetServer.cpp +++ b/engine/server/application/PlanetServer/src/shared/PlanetServer.cpp @@ -1472,7 +1472,8 @@ void PlanetServer::setDone(char const *reasonfmt, ...) "PlanetServer (pid %d) shutdown, reason: %s\n", static_cast(Os::getProcessId()), reason)); - + + va_end(ap); m_done = true; } } diff --git a/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp b/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp index 9353e2d9..f27df9a7 100644 --- a/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp +++ b/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp @@ -336,7 +336,8 @@ void DatabaseProcess::setDone(char const *reasonfmt, ...) static_cast(getProcessId()), static_cast(Os::getProcessId()), reason)); - + + va_end(ap); done = true; } } diff --git a/engine/server/library/serverGame/src/shared/controller/PlayerShipController.cpp b/engine/server/library/serverGame/src/shared/controller/PlayerShipController.cpp index 9b0cec0e..6350d91b 100644 --- a/engine/server/library/serverGame/src/shared/controller/PlayerShipController.cpp +++ b/engine/server/library/serverGame/src/shared/controller/PlayerShipController.cpp @@ -554,6 +554,7 @@ void PlayerShipController::logMoveFail(char const *reasonFmt, ...) const client->getCharacterObjectId().getValueString().c_str(), client->getStationId(), reason)); + va_end(ap); } // ---------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/core/GameServer.cpp b/engine/server/library/serverGame/src/shared/core/GameServer.cpp index cf3cb708..563fa2b8 100644 --- a/engine/server/library/serverGame/src/shared/core/GameServer.cpp +++ b/engine/server/library/serverGame/src/shared/core/GameServer.cpp @@ -4890,6 +4890,7 @@ void GameServer::setDone(char const *reasonfmt, ...) static_cast(Os::getProcessId()), reason)); + va_end(ap); m_done = true; } } diff --git a/engine/server/library/serverScript/src/shared/JNIWrappers.cpp b/engine/server/library/serverScript/src/shared/JNIWrappers.cpp index a6b55772..67623a69 100644 --- a/engine/server/library/serverScript/src/shared/JNIWrappers.cpp +++ b/engine/server/library/serverScript/src/shared/JNIWrappers.cpp @@ -78,6 +78,9 @@ LocalRefPtr createNewObject(jclass clazz, jmethodID constructorID, ...) va_start(marker, constructorID); LocalRefPtr result(new LocalRef(JavaLibrary::getEnv()->NewObjectV(clazz, constructorID, marker))); + + va_end(marker); + if (result->getValue() == 0) return LocalRef::cms_nullPtr; return result; @@ -187,8 +190,11 @@ LocalRefPtr callObjectMethod(const LocalRefParam & object, jmethodID methodID, . { va_list marker; va_start(marker, methodID); - + LocalRefPtr result(new LocalRef(JavaLibrary::getEnv()->CallObjectMethodV(object.getValue(), methodID, marker))); + + va_end(marker); + if (result->getValue() != 0) return result; } @@ -205,6 +211,9 @@ LocalObjectArrayRefPtr callObjectArrayMethod(const LocalRefParam & object, jmeth va_start(marker, methodID); LocalObjectArrayRefPtr result(new LocalObjectArrayRef(static_cast(JavaLibrary::getEnv()->CallObjectMethodV(object.getValue(), methodID, marker)))); + + va_end(marker); + if (result->getValue() != 0) return result; } @@ -221,6 +230,9 @@ LocalByteArrayRefPtr callByteArrayMethod(const LocalRefParam & object, jmethodID va_start(marker, methodID); LocalByteArrayRefPtr result(new LocalByteArrayRef(static_cast(JavaLibrary::getEnv()->CallObjectMethodV(object.getValue(), methodID, marker)))); + + va_end(marker); + if (result->getValue() != 0) return result; } @@ -236,7 +248,12 @@ jint callIntMethod(const LocalRefParam & object, jmethodID methodID, ...) va_list marker; va_start(marker, methodID); + //TODO: find out what type of object the below returns and get into a var so we can + //va_end properly + return JavaLibrary::getEnv()->CallIntMethodV(object.getValue(), methodID, marker); + + va_end(marker); //just to make cppcheck happy } return 0; } @@ -251,6 +268,8 @@ jlong callLongMethod(const LocalRefParam & object, jmethodID methodID, ...) va_start(marker, methodID); return JavaLibrary::getEnv()->CallLongMethodV(object.getValue(), methodID, marker); + + va_end(marker); //make cppcheck happy } return 0; } @@ -265,6 +284,8 @@ jfloat callFloatMethod(const LocalRefParam & object, jmethodID methodID, ...) va_start(marker, methodID); return JavaLibrary::getEnv()->CallFloatMethodV(object.getValue(), methodID, marker); + + va_end(marker); //make cppcheck happy } return 0; } @@ -279,6 +300,8 @@ jboolean callBooleanMethod(const LocalRefParam & object, jmethodID methodID, ... va_start(marker, methodID); return JavaLibrary::getEnv()->CallBooleanMethodV(object.getValue(), methodID, marker); + + va_end(marker); //make cppcheck happy } return JNI_FALSE; } @@ -293,6 +316,8 @@ void callVoidMethod(const LocalRefParam & object, jmethodID methodID, ...) va_start(marker, methodID); JavaLibrary::getEnv()->CallVoidMethodV(object.getValue(), methodID, marker); + + va_end(marker); } } @@ -306,6 +331,8 @@ jboolean callNonvirtualBooleanMethod(const LocalRefParam & object, jclass clazz, va_start(marker, methodID); return JavaLibrary::getEnv()->CallNonvirtualBooleanMethodV(object.getValue(), clazz, methodID, marker); + + va_end(marker); //make cppcheck happy } return JNI_FALSE; } @@ -318,6 +345,8 @@ void callStaticVoidMethod(jclass clazz, jmethodID methodID, ...) va_start(marker, methodID); JavaLibrary::getEnv()->CallStaticVoidMethodV(clazz, methodID, marker); + + va_end(marker); } //----------------------------------------------------------------------- @@ -328,6 +357,9 @@ LocalRefPtr callStaticObjectMethod(jclass clazz, jmethodID methodID, ...) va_start(marker, methodID); LocalRefPtr result(new LocalRef(JavaLibrary::getEnv()->CallStaticObjectMethodV(clazz, methodID, marker))); + + va_end(marker); //make cppcheck happy + if (result->getValue() == 0) return LocalRef::cms_nullPtr; return result; @@ -341,6 +373,9 @@ LocalObjectArrayRefPtr callStaticObjectArrayMethod(jclass clazz, jmethodID metho va_start(marker, methodID); LocalObjectArrayRefPtr result(new LocalObjectArrayRef(static_cast(JavaLibrary::getEnv()->CallStaticObjectMethodV(clazz, methodID, marker)))); + + va_end(marker); + if (result->getValue() == 0) return LocalObjectArrayRef::cms_nullPtr; return result; @@ -354,6 +389,9 @@ LocalByteArrayRefPtr callStaticByteArrayMethod(jclass clazz, jmethodID methodID, va_start(marker, methodID); LocalByteArrayRefPtr result(new LocalByteArrayRef(static_cast(JavaLibrary::getEnv()->CallStaticObjectMethodV(clazz, methodID, marker)))); + + va_end(marker); + if (result->getValue() == 0) return LocalByteArrayRef::cms_nullPtr; return result; @@ -407,6 +445,9 @@ JavaStringPtr callStringMethod(const LocalRefParam & object, jmethodID methodID, va_start(marker, methodID); jobject result = JavaLibrary::getEnv()->CallObjectMethodV(object.getValue(), methodID, marker); + + va_end(marker); + if (result != 0) { #ifdef _DEBUG @@ -432,6 +473,9 @@ JavaStringPtr callStaticStringMethod(jclass clazz, jmethodID methodID, ...) JavaStringPtr result(new JavaString(static_cast(JavaLibrary::getEnv()->CallStaticObjectMethodV(clazz, methodID, marker)))); + + va_end(marker); + if (result->getValue() != 0) return result; return JavaString::cms_nullPtr; diff --git a/engine/shared/library/sharedDebug/src/shared/Profiler.cpp b/engine/shared/library/sharedDebug/src/shared/Profiler.cpp index a0bd3089..7df643f3 100644 --- a/engine/shared/library/sharedDebug/src/shared/Profiler.cpp +++ b/engine/shared/library/sharedDebug/src/shared/Profiler.cpp @@ -217,8 +217,8 @@ bool VisibleExpandableEntry::pruneInvisibleChildren() for (Children::iterator i = m_children.begin(); i != m_children.end(); ) if ((*i)->m_visible == false) { - delete *i; m_children.erase(i); + delete *i; } else ++i; diff --git a/engine/shared/library/sharedFile/src/shared/FileManifest.cpp b/engine/shared/library/sharedFile/src/shared/FileManifest.cpp index 3a849751..c29c39de 100644 --- a/engine/shared/library/sharedFile/src/shared/FileManifest.cpp +++ b/engine/shared/library/sharedFile/src/shared/FileManifest.cpp @@ -278,9 +278,9 @@ void FileManifest::addNewManifestEntry(const char *fileName, int fileSize) if (fileSize) ((insertReturn.first)->second)->size = fileSize; - // delete the new entry we created - delete entry; } + + delete entry; #else return; #endif @@ -299,9 +299,7 @@ void FileManifest::addStoredManifestEntry(const char *fileName, const char * sce std::pair insertReturn = s_manifest.insert(std::pair(crc, entry)); - // if the insert failed, delete the entry we created - if (!insertReturn.second) - delete entry; + delete entry; } // ----------------------------------------------------------------------- diff --git a/engine/shared/library/sharedImage/src/shared/TargaFormat.cpp b/engine/shared/library/sharedImage/src/shared/TargaFormat.cpp index e85772d5..d6970c0a 100644 --- a/engine/shared/library/sharedImage/src/shared/TargaFormat.cpp +++ b/engine/shared/library/sharedImage/src/shared/TargaFormat.cpp @@ -1167,7 +1167,7 @@ bool TargaFormat::saveImage(const Image &image, const char *filename) //--------------------------------------------------- f = fopen(filename, "wb"); - if (!f) + if (f==NULL) { DEBUG_WARNING(true, ("Unable to open Targa destination file %s.\n", filename)); return false; diff --git a/engine/shared/library/sharedMath/src/shared/PaletteArgb.cpp b/engine/shared/library/sharedMath/src/shared/PaletteArgb.cpp index 097826be..c00fe80e 100644 --- a/engine/shared/library/sharedMath/src/shared/PaletteArgb.cpp +++ b/engine/shared/library/sharedMath/src/shared/PaletteArgb.cpp @@ -253,7 +253,7 @@ bool PaletteArgb::write(const char *pathName) const // open file FILE *const file = fopen(pathName, "wb"); - if (!file) + if (file==NULL) { WARNING(true, ("failed to open file [%s] for writing.", pathName)); return false; diff --git a/engine/shared/library/sharedNetwork/src/linux/NetworkGetHostName.cpp b/engine/shared/library/sharedNetwork/src/linux/NetworkGetHostName.cpp index a68bba8d..5d210dbd 100644 --- a/engine/shared/library/sharedNetwork/src/linux/NetworkGetHostName.cpp +++ b/engine/shared/library/sharedNetwork/src/linux/NetworkGetHostName.cpp @@ -96,7 +96,7 @@ addrList() if (errno != EINVAL || lastReqSize != 0) { WARNING(true, ("Error getting interface list: %s", strerror(errno))); - delete buf; + delete [] buf; return; } } diff --git a/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp b/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp index a74f665b..7141d739 100644 --- a/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp +++ b/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp @@ -185,4 +185,6 @@ int File::print(const char *format, ...) va_start(argptr, format); return vfprintf(m_fp, format, argptr); + + va_end(argptr); //make cppcheck happy } // File::print diff --git a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.cpp b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.cpp index 6d486c33..a09de08a 100644 --- a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.cpp +++ b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.cpp @@ -151,10 +151,10 @@ CSAssistGameAPIcore::CSAssistGameAPIcore(CSAssistGameAPI *api, const char *serve m_serverList.push_back(sid); } //fprintf(stderr, "res=%d, p=%s, host=%s, port=%d, size=%d\n", res, p, host, port, m_serverList.size()); - delete p; + delete [] p; } - delete host; - delete buf; + delete [] host; + delete [] buf; m_curServer = m_serverList.begin(); GetLBHost(); //