From 1ce2c52f5b7b271c32bbecbe43003a33a0395e56 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Fri, 15 Jan 2016 23:01:17 -0600 Subject: [PATCH] undo some more ill advised changes i made based on static analyzer output - they can cause buffer issues --- .../projects/Session/CommonAPI/CommonClient.cpp | 2 +- .../projects/Session/LoginAPI/ClientCore.cpp | 2 +- .../soePlatform/ChatAPI/projects/ChatAPI/Request.cpp | 4 ++-- .../soePlatform/VChatAPI/utils2.0/utils/Api/api.cpp | 12 ++++++------ .../VChatAPI/utils2.0/utils/Api/apiMessages.cpp | 12 ++++++------ .../VChatAPI/utils2.0/utils/Api/apiPinned.cpp | 10 +++++----- .../VChatAPI/utils2.0/utils/Base/basicConfig.cpp | 4 ++-- .../utils2.0/utils/Base/serializeTemplates.h | 8 ++++---- .../ours/library/archive/src/shared/AutoDeltaSet.h | 2 +- 9 files changed, 28 insertions(+), 28 deletions(-) mode change 100755 => 100644 external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Request.cpp mode change 100755 => 100644 external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/api.cpp mode change 100755 => 100644 external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiMessages.cpp mode change 100755 => 100644 external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiPinned.cpp mode change 100755 => 100644 external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/basicConfig.cpp mode change 100755 => 100644 external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeTemplates.h mode change 100755 => 100644 external/ours/library/archive/src/shared/AutoDeltaSet.h diff --git a/external/3rd/library/platform/projects/Session/CommonAPI/CommonClient.cpp b/external/3rd/library/platform/projects/Session/CommonAPI/CommonClient.cpp index 26bca98e..4856d6e2 100755 --- a/external/3rd/library/platform/projects/Session/CommonAPI/CommonClient.cpp +++ b/external/3rd/library/platform/projects/Session/CommonAPI/CommonClient.cpp @@ -632,7 +632,7 @@ void apiCore::Process() while (mapIterator != mRequestMap.end()) { apiTrackedRequest & request = (*mapIterator).second; - ++mapIterator; + mapIterator++; if (request.Expired()) { diff --git a/external/3rd/library/platform/projects/Session/LoginAPI/ClientCore.cpp b/external/3rd/library/platform/projects/Session/LoginAPI/ClientCore.cpp index fc3530ea..a9e2caf6 100755 --- a/external/3rd/library/platform/projects/Session/LoginAPI/ClientCore.cpp +++ b/external/3rd/library/platform/projects/Session/LoginAPI/ClientCore.cpp @@ -1657,7 +1657,7 @@ namespace LoginAPI Message::NotifySessionKick message(iterator); std::vector sessionList; - for (std::vector::const_iterator i=message.GetSessionList().begin(); i!=message.GetSessionList().end(); ++i) + for (std::vector::const_iterator i=message.GetSessionList().begin(); i!=message.GetSessionList().end(); i++) { sessionList.push_back(i->c_str()); } diff --git a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Request.cpp b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Request.cpp old mode 100755 new mode 100644 index 33599863..e58b011c --- a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Request.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/Request.cpp @@ -124,7 +124,7 @@ void RGetAvatarKeywords::pack(ByteStream &msg) put(msg, m_srcAvatarID); } -RSearchAvatarKeywords::RSearchAvatarKeywords(const ChatUnicodeString &nodeAddress, const ChatUnicodeString *keywordsList, unsigned keywordsLength) +RSearchAvatarKeywords::RSearchAvatarKeywords(const ChatUnicodeString nodeAddress, const ChatUnicodeString *keywordsList, unsigned keywordsLength) : GenericRequest(REQUEST_SEARCHAVATARKEYWORDS), m_keywordsLength(keywordsLength), m_keywordsList(NULL) @@ -1282,7 +1282,7 @@ void RClassifyPersistentMessages::pack(ByteStream &msg) put(msg, m_track); put(msg, m_srcAvatarID); put(msg, m_messageIDs.size()); - for (idIter = m_messageIDs.begin(); idIter != m_messageIDs.end(); ++idIter) + for (idIter = m_messageIDs.begin(); idIter != m_messageIDs.end(); idIter++) { put(msg, *idIter); } diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/api.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/api.cpp old mode 100755 new mode 100644 index 7a82e750..3af047a2 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/api.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/api.cpp @@ -119,12 +119,12 @@ namespace API_NAMESPACE { // ensure that callback mecahnism isn't triggered at this point HostMap_t::iterator iter; - for (iter = mHostMap[0].begin(); iter != mHostMap[0].end(); ++iter) + for (iter = mHostMap[0].begin(); iter != mHostMap[0].end(); iter++) { iter->first->SetHandler(0); iter->first->Release(); } - for (iter = mHostMap[1].begin(); iter != mHostMap[1].end(); ++iter) + for (iter = mHostMap[1].begin(); iter != mHostMap[1].end(); iter++) { iter->first->SetHandler(0); iter->first->Release(); @@ -555,7 +555,7 @@ namespace API_NAMESPACE if (mTimeoutTimer != currentTime) { TimeoutMap_t::iterator iterator; - for (iterator = mTimeoutMap.begin(); iterator != mTimeoutMap.end(); ++iterator) + for (iterator = mTimeoutMap.begin(); iterator != mTimeoutMap.end(); iterator++) { TimeoutList_t & timeoutList = iterator->second; while (!timeoutList.empty() && timeoutList.front().second < currentTime) @@ -870,7 +870,7 @@ namespace API_NAMESPACE size_t i = labelsAndValues.size(); labelsAndValues.resize(labelsAndValues.size() + mspLabelToEntryMap->size()); - for (LabelToEntryMap_t::const_iterator it = mspLabelToEntryMap->begin(); it != mspLabelToEntryMap->end(); ++it, ++i) + for (LabelToEntryMap_t::const_iterator it = mspLabelToEntryMap->begin(); it != mspLabelToEntryMap->end(); it++, i++) { string value; @@ -938,7 +938,7 @@ namespace API_NAMESPACE { initializeMap(); - for (soe::NameValuePairs_t::const_iterator it = labelsAndValues.begin(); it != labelsAndValues.end(); ++it) + for (soe::NameValuePairs_t::const_iterator it = labelsAndValues.begin(); it != labelsAndValues.end(); it++) { LabelToEntryMap_t::iterator mIter = mspLabelToEntryMap->find(it->name); @@ -1029,7 +1029,7 @@ namespace API_NAMESPACE { ClassScribeSet_t::iterator scribeIter; - for (scribeIter = classScribeSet.begin(); scribeIter != classScribeSet.end(); ++scribeIter) + for (scribeIter = classScribeSet.begin(); scribeIter != classScribeSet.end(); scribeIter++) { // This will cause the scribe to reinitialize itself next time it's used, // thereby copying the new values. Storing references was too dangerous. diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiMessages.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiMessages.cpp old mode 100755 new mode 100644 index 15a337e8..c38875ab --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiMessages.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiMessages.cpp @@ -24,7 +24,7 @@ namespace API_NAMESPACE #ifdef TRACK_READ_WRITE_FAILURES soe::ClearMessageFailureStack(); #endif - for(iterator=mMembers.begin(); iterator!=mMembers.end(); ++iterator) + for(iterator=mMembers.begin(); iterator!=mMembers.end(); iterator++) { MemberInfo_t & memberInfo = *iterator; @@ -50,7 +50,7 @@ namespace API_NAMESPACE } if (succeeded) { - for(iterator=mOptionalMembers.begin(); iterator!=mOptionalMembers.end(); ++iterator) + for(iterator=mOptionalMembers.begin(); iterator!=mOptionalMembers.end(); iterator++) { MemberInfo_t & memberInfo = *iterator; unsigned bytes = memberInfo.data->Read(stream, size, memberInfo.size, version); @@ -80,7 +80,7 @@ namespace API_NAMESPACE soe::ClearMessageFailureStack(); #endif - for (iterator=mMembers.begin(); iterator!=mMembers.end(); ++iterator) + for (iterator=mMembers.begin(); iterator!=mMembers.end(); iterator++) { const MemberInfo_t & memberInfo = *iterator; @@ -107,7 +107,7 @@ namespace API_NAMESPACE } if (succeeded) { - for (iterator=mOptionalMembers.begin(); iterator!=mOptionalMembers.end(); ++iterator) + for (iterator=mOptionalMembers.begin(); iterator!=mOptionalMembers.end(); iterator++) { const MemberInfo_t & memberInfo = *iterator; unsigned bytes = memberInfo.data->Write(stream, size, version); @@ -151,7 +151,7 @@ namespace API_NAMESPACE bool printedOne = false; MemberVector_t::const_iterator iterator; - for (iterator=mMembers.begin(); iterator!=mMembers.end(); ++iterator) + for (iterator=mMembers.begin(); iterator!=mMembers.end(); iterator++) { int bytes = 0; @@ -184,7 +184,7 @@ namespace API_NAMESPACE bytesTotal += bytes; } } - for (iterator=mOptionalMembers.begin(); iterator!=mOptionalMembers.end(); ++iterator) + for (iterator=mOptionalMembers.begin(); iterator!=mOptionalMembers.end(); iterator++) { int bytes = 0; diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiPinned.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiPinned.cpp old mode 100755 new mode 100644 index f98b00bb..5a1dd30d --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiPinned.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Api/apiPinned.cpp @@ -109,12 +109,12 @@ namespace NAMESPACE { // ensure that callback mecahnism isn't triggered at this point HostMap_t::iterator iter; - for (iter = mHostMap[0].begin(); iter != mHostMap[0].end(); ++iter) + for (iter = mHostMap[0].begin(); iter != mHostMap[0].end(); iter++) { iter->first->SetHandler(0); iter->first->Release(); } - for (iter = mHostMap[1].begin(); iter != mHostMap[1].end(); ++iter) + for (iter = mHostMap[1].begin(); iter != mHostMap[1].end(); iter++) { iter->first->SetHandler(0); iter->first->Release(); @@ -294,7 +294,7 @@ namespace NAMESPACE ApiConnection * connection = NULL; unsigned hashIndex = hashValue % mActiveHosts[0].size(); unsigned curIndex = 0; - for (ConnectionSet_t::iterator it = mActiveHosts[0].begin(); it != mActiveHosts[0].end(); ++it, ++curIndex) + for (ConnectionSet_t::iterator it = mActiveHosts[0].begin(); it != mActiveHosts[0].end(); it++, curIndex++) { if (hashIndex == curIndex) { @@ -317,7 +317,7 @@ namespace NAMESPACE ApiConnection * connection = NULL; unsigned hashIndex = hashValue % mActiveHosts[1].size(); unsigned curIndex = 0; - for (ConnectionSet_t::iterator it = mActiveHosts[1].begin(); it != mActiveHosts[1].end(); ++it, ++curIndex) + for (ConnectionSet_t::iterator it = mActiveHosts[1].begin(); it != mActiveHosts[1].end(); it++, curIndex++) { if (hashIndex == curIndex) { @@ -399,7 +399,7 @@ namespace NAMESPACE if (mTimeoutTimer != currentTime) { TimeoutMap_t::iterator iterator; - for (iterator = mTimeoutMap.begin(); iterator != mTimeoutMap.end(); ++iterator) + for (iterator = mTimeoutMap.begin(); iterator != mTimeoutMap.end(); iterator++) { TimeoutList_t & timeoutList = iterator->second; while (!timeoutList.empty() && timeoutList.front().second < currentTime) diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/basicConfig.cpp b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/basicConfig.cpp old mode 100755 new mode 100644 index fd7c8d08..ae753234 --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/basicConfig.cpp +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/basicConfig.cpp @@ -29,7 +29,7 @@ BasicConfig::~BasicConfig() void BasicConfig::Push(const soe::NameValuePairs_t & paramValuePairs) { - for (soe::NameValuePairs_t::const_iterator pIter = paramValuePairs.begin(); pIter != paramValuePairs.end(); ++pIter) + for (soe::NameValuePairs_t::const_iterator pIter = paramValuePairs.begin(); pIter != paramValuePairs.end(); pIter++) { Set(pIter->name, pIter->value); } @@ -40,7 +40,7 @@ void BasicConfig::Pull(soe::NameValuePairs_t & paramValuePairs) const size_t index = paramValuePairs.size(); paramValuePairs.resize(index + mParamMap.size()); - for (ConfigMap_t::const_iterator pIter = mParamMap.begin(); pIter != mParamMap.end(); ++pIter, ++index) + for (ConfigMap_t::const_iterator pIter = mParamMap.begin(); pIter != mParamMap.end(); pIter++, index++) { paramValuePairs[index].name = pIter->first; paramValuePairs[index].value = pIter->second.first; diff --git a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeTemplates.h b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeTemplates.h old mode 100755 new mode 100644 index 3c867c3d..c2f745ed --- a/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeTemplates.h +++ b/external/3rd/library/soePlatform/VChatAPI/utils2.0/utils/Base/serializeTemplates.h @@ -24,7 +24,7 @@ namespace soe return 0; } size_t index = 0; - for (typename std::map::const_iterator iter = data.begin(); iter != data.end(); ++iter, ++index) + for (typename std::map::const_iterator iter = data.begin(); iter != data.end(); iter++, index++) { elementBytes = Write(stream+bytes, size-bytes, iter->second, version); if (!elementBytes) { @@ -621,7 +621,7 @@ namespace soe virtual void ClearMembers() { typename MemberScribeVector_t::const_iterator memberIter; - for (memberIter = mMemberScribes.begin(); memberIter != mMemberScribes.end(); ++memberIter) + for (memberIter = mMemberScribes.begin(); memberIter != mMemberScribes.end(); memberIter++) { MemberScribe_t * pMemberScribe = *memberIter; delete pMemberScribe; @@ -655,7 +655,7 @@ namespace soe unsigned bytesTotal = 0; typename MemberScribeVector_t::const_iterator memberIter; - for (memberIter = mMemberScribes.begin(); memberIter != mMemberScribes.end(); ++memberIter) + for (memberIter = mMemberScribes.begin(); memberIter != mMemberScribes.end(); memberIter++) { MemberScribe_t * pMemberScribe = *memberIter; @@ -688,7 +688,7 @@ namespace soe unsigned bytesTotal = 0; typename MemberScribeVector_t::const_iterator memberIter; - for (memberIter = mMemberScribes.begin(); memberIter != mMemberScribes.end(); ++memberIter) + for (memberIter = mMemberScribes.begin(); memberIter != mMemberScribes.end(); memberIter++) { const MemberScribe_t * pMemberScribe = *memberIter; diff --git a/external/ours/library/archive/src/shared/AutoDeltaSet.h b/external/ours/library/archive/src/shared/AutoDeltaSet.h old mode 100755 new mode 100644 index 21cc93ca..a548dce4 --- a/external/ours/library/archive/src/shared/AutoDeltaSet.h +++ b/external/ours/library/archive/src/shared/AutoDeltaSet.h @@ -187,7 +187,7 @@ inline typename AutoDeltaSet::const_iterator AutoDeltaSet // @note apathy - hack to convert from const_iterator to iterator as requried by STLPort typename SetType::iterator tmp(m_set.begin()); std::advance(tmp, std::distance(tmp, i)); - ++i; + i++; m_set.erase(tmp); touch();