libtransport.git Changeset - 2f61148b10d9

Changeset - 2f61148b10d9

Parent rev.

Child rev.

[Not reviewed]

0 1 0

HanzZ - 14 years ago 2011-11-14 15:42:30
hanzz.k@gmail.com

Fix potential crashes in statsresponder

1 file changed with 8 insertions and 2 deletions:

src/statsresponder.cpp

0 comments (0 inline, 0 general)

src/statsresponder.cpp

➞

Show inline comments

@@ @@ -70,52 +70,58 @@ unsigned long StatsResponder::usedMemory() { @@
 		rss += backend->res - backend->shared;
+	}
 	return (unsigned long) rss;
+}
 bool StatsResponder::handleGetRequest(const Swift::JID& from, const Swift::JID& to, const std::string& id, boost::shared_ptr<StatsPayload> stats) {
 	boost::shared_ptr<StatsPayload> response(new StatsPayload());
 	if (stats->getItems().empty()) {
 		response->addItem(StatsPayload::Item("uptime"));
 		response->addItem(StatsPayload::Item("users/online"));
 		response->addItem(StatsPayload::Item("contacts/online"));
 		response->addItem(StatsPayload::Item("contacts/total"));
 		response->addItem(StatsPayload::Item("backends"));
 		response->addItem(StatsPayload::Item("memory-usage"));
+	}
 	else {
 		unsigned long contactsOnline = 0;
 		unsigned long contactsTotal = 0;
 		Swift::StatusShow s;
 		std::string statusMessage;
 		for (std::map<std::string, User *>::const_iterator it = m_userManager->getUsers().begin(); it != m_userManager->getUsers().end(); it++) {
 			if (!(*it).second) {
 				continue;
+			}
 			const RosterManager::BuddiesMap &buddies = (*it).second->getRosterManager()->getBuddies();
 			contactsTotal += buddies.size();
 			for(RosterManager::BuddiesMap::const_iterator it = buddies.begin(); it != buddies.end(); it++) {
 				if (!(*it).second->getStatus(s, statusMessage))
 			for(RosterManager::BuddiesMap::const_iterator bt = buddies.begin(); bt != buddies.end(); bt++) {
 				if (!(*bt).second) {
 					continue;
+				}
 				if (!(*bt).second->getStatus(s, statusMessage))
 					continue;
 				if (s.getType() != Swift::StatusShow::None) {
 					contactsOnline++;
+				}
+			}
+		}
 		BOOST_FOREACH(const StatsPayload::Item &item, stats->getItems()) {
 			if (item.getName() == "uptime") {
 				response->addItem(StatsPayload::Item("uptime", "seconds", boost::lexical_cast<std::string>(time(0) - m_start)));
+			}
 			else if (item.getName() == "users/online") {
 				response->addItem(StatsPayload::Item("users/online", "users", boost::lexical_cast<std::string>(m_userManager->getUserCount())));
+			}
 			else if (item.getName() == "backends") {
 				response->addItem(StatsPayload::Item("backends", "backends", boost::lexical_cast<std::string>(m_server->getBackendCount())));
+			}
 			else if (item.getName() == "memory-usage") {
 				response->addItem(StatsPayload::Item("memory-usage", "KB", boost::lexical_cast<std::string>(usedMemory())));
+			}
 			else if (item.getName() == "contacts/online") {
 				response->addItem(StatsPayload::Item("contacts/online", "contacts", boost::lexical_cast<std::string>(contactsOnline)));
+			}
 			else if (item.getName() == "contacts/total") {

0 comments (0 inline, 0 general)