libtransport.git Changeset - 75f202cb884b

Changeset - 75f202cb884b

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Jan Kaluza - 13 years ago 2012-03-20 10:28:39
hanzz.k@gmail.com

Catch out of range exception

1 file changed with 13 insertions and 2 deletions:

backends/skype/main.cpp

0 comments (0 inline, 0 general)

backends/skype/main.cpp

➞

Show inline comments

@@ @@ -35,13 +35,19 @@ static LoggerPtr logger = Logger::getLogger("backend"); @@
 using namespace Transport;
 class SpectrumNetworkPlugin;
 #define GET_RESPONSE_DATA(RESP, DATA) ((RESP.find(std::string(DATA) + " ") != std::string::npos) ? RESP.substr(RESP.find(DATA) + strlen(DATA) + 1) : "");
 #define GET_PROPERTY(VAR, OBJ, WHICH, PROP) std::string VAR = sk->send_command(std::string("GET ") + OBJ + " " + WHICH + " " + PROP); \
 					VAR = GET_RESPONSE_DATA(VAR, PROP);
 					try {\
 						VAR = GET_RESPONSE_DATA(VAR, PROP);\
 					}\
 					catch (std::out_of_range& oor) {\
 						VAR="";\
+					}
 SpectrumNetworkPlugin *np;
 static gboolean nodaemon = FALSE;
 static gchar *logfile = NULL;
@@ @@ -544,13 +550,18 @@ bool Skype::loadSkypeBuddies() { @@
+			}
 			boost::split(data, name, boost::is_any_of(" "));
 			name = GET_RESPONSE_DATA(name, "DISPLAYNAME");
 			std::string users = send_command("GET GROUP " + data[1] + " USERS");
 			users = GET_RESPONSE_DATA(users, "USERS");
 			try {
 				users = GET_RESPONSE_DATA(users, "USERS");
+			}
 			catch (std::out_of_range& oor) {
 				continue;
+			}
 			boost::split(data, users, boost::is_any_of(","));
 			BOOST_FOREACH(std::string u, data) {
 				group_map[u] = grp;
+			}
+		}
+	}

0 comments (0 inline, 0 general)