From eb9ff538b99e08cb1a0d1a5e82d1159db90f8fac Mon Sep 17 00:00:00 2001 From: christian linke Date: Tue, 8 Jan 2013 10:25:46 +0100 Subject: * some minor coverity check fixes Signed-off-by: christian linke --- AudioManagerDaemon/src/CAmCommandReceiver.cpp | 4 ++- AudioManagerDaemon/src/CAmDatabaseHandler.cpp | 6 ++-- .../src/CAmNodeStateCommunicator.cpp | 32 ++++++++++++++++------ AudioManagerDaemon/src/CAmRoutingSender.cpp | 7 ++++- AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp | 8 +++--- AudioManagerDaemon/src/CAmTelnetServer.cpp | 4 +-- .../src/CAmRoutingSenderAsync.cpp | 13 +++++++-- .../src/CAmDbusMessageHandler.cpp | 2 ++ 8 files changed, 55 insertions(+), 21 deletions(-) diff --git a/AudioManagerDaemon/src/CAmCommandReceiver.cpp b/AudioManagerDaemon/src/CAmCommandReceiver.cpp index f3fa3ef..fcb2e14 100644 --- a/AudioManagerDaemon/src/CAmCommandReceiver.cpp +++ b/AudioManagerDaemon/src/CAmCommandReceiver.cpp @@ -58,7 +58,9 @@ CAmCommandReceiver::CAmCommandReceiver(CAmDatabaseHandler *iDatabaseHandler, CAm mListStartupHandles(), // mListRundownHandles(), // mWaitStartup(false), // - mWaitRundown(false) + mWaitRundown(false), // + mLastErrorStartup(E_UNKNOWN), // + mLastErrorRundown(E_UNKNOWN) { assert(mDatabaseHandler!=NULL); assert(mSocketHandler!=NULL); diff --git a/AudioManagerDaemon/src/CAmDatabaseHandler.cpp b/AudioManagerDaemon/src/CAmDatabaseHandler.cpp index 4e9e51e..b9fcd4a 100644 --- a/AudioManagerDaemon/src/CAmDatabaseHandler.cpp +++ b/AudioManagerDaemon/src/CAmDatabaseHandler.cpp @@ -152,7 +152,10 @@ CAmDatabaseHandler::CAmDatabaseHandler(std::string databasePath) : if (infile) { - remove(mPath.c_str()); + if(remove(mPath.c_str())==0) + { + logError("DatabaseHandler::DatabaseHandler Knocked down database failed !"); + } logInfo("DatabaseHandler::DatabaseHandler Knocked down database"); } @@ -3658,7 +3661,6 @@ am_timeSync_t CAmDatabaseHandler::calculateMainConnectionDelay(const am_mainConn if ((eCode = sqlite3_finalize(query)) != SQLITE_OK) { logError("DatabaseHandler::calculateMainConnectionDelay SQLITE Finalize error code:", eCode); - MY_SQLITE_FINALIZE(query) return (E_DATABASE_ERROR); } if (min < 0) diff --git a/AudioManagerDaemon/src/CAmNodeStateCommunicator.cpp b/AudioManagerDaemon/src/CAmNodeStateCommunicator.cpp index ce6fd62..16c5e8b 100644 --- a/AudioManagerDaemon/src/CAmNodeStateCommunicator.cpp +++ b/AudioManagerDaemon/src/CAmNodeStateCommunicator.cpp @@ -578,7 +578,10 @@ void CAmNodeStateCommunicator::sendMessage(DBusMessage* message, DBusMessage* or { dbus_uint32_t serial = dbus_message_get_serial(origMessage); - dbus_connection_send(mpDBusConnection, message, &serial); + if(!dbus_connection_send(mpDBusConnection, message, &serial)) + { + logError( "CAmNodeStateCommunicator::sendMessage DBUS handler Out Of Memory!"); + } dbus_connection_flush(mpDBusConnection); dbus_message_unref(message); } @@ -695,11 +698,7 @@ DBusHandlerResult CAmNodeStateCommunicator::signalCallback(DBusConnection* conn, return (DBUS_HANDLER_RESULT_NOT_YET_HANDLED); } } - else - { - return (DBUS_HANDLER_RESULT_NOT_YET_HANDLED); - } - printf("asdasdas\n"); + return (DBUS_HANDLER_RESULT_NOT_YET_HANDLED); } @@ -714,22 +713,25 @@ am_Error_e CAmNodeStateCommunicator::readIntegerProperty(const std::string prope if (!message) { logError("CAmNodeStateCommunicator::readIntegerProperty dbus error:", error.message); + dbus_message_unref(message); return (E_UNKNOWN); } dbus_message_iter_init_append(message, &iter); - const char *interface=std::string(NSM_INTERFACE).c_str(); + const char *interface=NSM_INTERFACE; const char *propertyChar=property.c_str(); if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &interface)) { logError("CAmNodeStateCommunicator::readIntegerProperty append error"); + dbus_message_unref(message); return (E_UNKNOWN); } if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &propertyChar)) { logError("CAmNodeStateCommunicator::readIntegerProperty append error"); + dbus_message_unref(message); return (E_UNKNOWN); } @@ -737,13 +739,22 @@ am_Error_e CAmNodeStateCommunicator::readIntegerProperty(const std::string prope if (!reply) { logError("CAmNodeStateCommunicator::readIntegerProperty failed, dbus error", error.message); + dbus_message_unref(message); return (E_UNKNOWN); } - dbus_message_iter_init(reply,&iterVariant); + if(!dbus_message_iter_init(reply,&iterVariant)) + { + logError("CAmNodeStateCommunicator::readIntegerProperty failed, dbus error", error.message); + dbus_message_unref(message); + dbus_message_unref(reply); + return (E_UNKNOWN); + } if (dbus_message_iter_get_arg_type (&iterVariant)!= DBUS_TYPE_VARIANT) { logError("CAmNodeStateCommunicator::readIntegerProperty failed, dbus return type wrong"); + dbus_message_unref(reply); + dbus_message_unref(message); return (E_UNKNOWN); } DBusMessageIter subiter; @@ -751,11 +762,14 @@ am_Error_e CAmNodeStateCommunicator::readIntegerProperty(const std::string prope if (dbus_message_iter_get_arg_type (&subiter)!= DBUS_TYPE_INT32) { logError("CAmNodeStateCommunicator::readIntegerProperty failed, dbus return type wrong"); + dbus_message_unref(reply); + dbus_message_unref(message); return (E_UNKNOWN); } dbus_message_iter_get_basic(&subiter,&value); - dbus_message_unref(reply); + dbus_message_unref(reply); + dbus_message_unref(message); return (E_OK); } diff --git a/AudioManagerDaemon/src/CAmRoutingSender.cpp b/AudioManagerDaemon/src/CAmRoutingSender.cpp index 57892c7..75d5052 100644 --- a/AudioManagerDaemon/src/CAmRoutingSender.cpp +++ b/AudioManagerDaemon/src/CAmRoutingSender.cpp @@ -546,9 +546,14 @@ am_Handle_s CAmRoutingSender::createHandle(const am_handleData_c& handleData, co */ CAmRoutingSender::am_handleData_c CAmRoutingSender::returnHandleData(const am_Handle_s handle) const { + HandlesMap::const_iterator it = mlistActiveHandles.begin(); it = mlistActiveHandles.find(handle); - return (it->second); + if (it!=mlistActiveHandles.end()) + return (it->second); + am_handleData_c handleData; + handleData.sinkID=0; + return (handleData); } void CAmRoutingSender::setRoutingReady() diff --git a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp index 87f9659..15b4a0e 100644 --- a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp +++ b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp @@ -127,7 +127,7 @@ void CAmTelnetMenuHelper::newSocketConnection(int filedescriptor) mCurrentMainStateMap.insert(it, std::make_pair(filedescriptor, state)); // Send welcome message welcome << COLOR_WELCOME << "Welcome to GENIVI AudioManager " << DAEMONVERSION << COLOR_DEFAULT << "\n>"; - send(filedescriptor, welcome.str().c_str(), welcome.str().size(), 0); + assert(send(filedescriptor, welcome.str().c_str(), welcome.str().size(), 0)>=0); logInfo("[TN] New connection: ", filedescriptor); } @@ -216,14 +216,14 @@ void CAmTelnetMenuHelper::enterCmdQueue(std::queue& CmdQueue, int& void CAmTelnetMenuHelper::sendError(int& filedescriptor, std::string error_string) /****************************************************************************/ { - send(filedescriptor, error_string.c_str(), error_string.size(), 0); + assert(send(filedescriptor, error_string.c_str(), error_string.size(), 0)>=0); } /****************************************************************************/ void CAmTelnetMenuHelper::sendTelnetLine(int& filedescriptor, std::stringstream& line) /****************************************************************************/ { - send(filedescriptor, line.str().c_str(), line.str().size(), 0); + assert(send(filedescriptor, line.str().c_str(), line.str().size(), 0)>=0); } /****************************************************************************/ @@ -256,7 +256,7 @@ void CAmTelnetMenuHelper::sendCurrentCmdPrompt(int& filedescriptor) default: break; } - send(filedescriptor, outputstream.str().c_str(), outputstream.str().size(), 0); + assert(send(filedescriptor, outputstream.str().c_str(), outputstream.str().size(), 0)>=0); } else { diff --git a/AudioManagerDaemon/src/CAmTelnetServer.cpp b/AudioManagerDaemon/src/CAmTelnetServer.cpp index fb2e98e..fcd7cc7 100755 --- a/AudioManagerDaemon/src/CAmTelnetServer.cpp +++ b/AudioManagerDaemon/src/CAmTelnetServer.cpp @@ -89,12 +89,12 @@ CAmTelnetServer::CAmTelnetServer(CAmSocketHandler *iSocketHandler, CAmCommandSen //setup the port Listener mConnectFD = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); assert (mConnectFD>0); - setsockopt(mConnectFD, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)); + assert(setsockopt(mConnectFD, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int))==0); memset(&servAddr, 0, sizeof(servAddr)); servAddr.sin_family = AF_INET; servAddr.sin_addr.s_addr = INADDR_ANY; servAddr.sin_port = htons(servPort); - bind(mConnectFD, (struct sockaddr *) &servAddr, sizeof(servAddr)); + assert(bind(mConnectFD, (struct sockaddr *) &servAddr, sizeof(servAddr))==0); if (listen(mConnectFD, mMaxConnections) < 0) { diff --git a/PluginRoutingInterfaceAsync/src/CAmRoutingSenderAsync.cpp b/PluginRoutingInterfaceAsync/src/CAmRoutingSenderAsync.cpp index 83415e9..fed21aa 100644 --- a/PluginRoutingInterfaceAsync/src/CAmRoutingSenderAsync.cpp +++ b/PluginRoutingInterfaceAsync/src/CAmRoutingSenderAsync.cpp @@ -181,7 +181,15 @@ bool CAmWorker::timedWait(timespec timer) } CAmRoutingSenderAsync::CAmRoutingSenderAsync() : - mReceiveInterface(0), mDomains(createDomainTable()), mSinks(createSinkTable()), mSources(createSourceTable()), mGateways(createGatewayTable()), mMapHandleWorker(), mMapConnectionIDRoute(), mPool(10) + mReceiveInterface(0), // + mDomains(createDomainTable()), // + mSinks(createSinkTable()), // + mSources(createSourceTable()), // + mGateways(createGatewayTable()), // + mMapHandleWorker(), // + mMapConnectionIDRoute(), // + mPool(10), + mInterruptThread(0) { } @@ -965,7 +973,8 @@ asycDisConnectWorker::asycDisConnectWorker(CAmRoutingSenderAsync *asyncSender, C mAsyncSender(asyncSender), // mShadow(shadow), // mHandle(handle), // - mConnectionID(connectionID) + mConnectionID(connectionID), // + mConnectionFormat(CF_UNKNOWN) { } diff --git a/PluginRoutingInterfaceDbus/src/CAmDbusMessageHandler.cpp b/PluginRoutingInterfaceDbus/src/CAmDbusMessageHandler.cpp index 08eee7b..86d840b 100644 --- a/PluginRoutingInterfaceDbus/src/CAmDbusMessageHandler.cpp +++ b/PluginRoutingInterfaceDbus/src/CAmDbusMessageHandler.cpp @@ -265,6 +265,8 @@ double CAmRoutingDbusMessageHandler::getDouble() am::am_Availability_s CAmRoutingDbusMessageHandler::getAvailability() { am::am_Availability_s availability; + availability.availability=A_UNKNOWN; + availability.availabilityReason=AR_UNKNOWN; if (DBUS_TYPE_STRUCT != dbus_message_iter_get_arg_type(&mDBusMessageIter)) { log(&routingDbus, DLT_LOG_ERROR, "DBusMessageHandler::getAvailability DBUS handler argument is no struct!"); -- cgit v1.2.1