X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FServerSocket.cpp;h=fb6e3bf75c6abe24c62e7c7b05ad683041b6df74;hb=fb90076e9065018ee0ef9e16bae2a5d9dcc9436d;hp=7b9d6df5af71c81d885c36c29045127a2964ae47;hpb=8995a8387a03361b6a7ff44b447a90a6187b1a14;p=lyx.git

diff --git a/src/ServerSocket.cpp b/src/ServerSocket.cpp
index 7b9d6df5af..fb6e3bf75c 100644
--- a/src/ServerSocket.cpp
+++ b/src/ServerSocket.cpp
@@ -41,7 +41,6 @@ using namespace std;
 using namespace lyx::support;
 
 
-
 namespace lyx {
 
 // Address is the unix address for the socket.
@@ -98,6 +97,11 @@ string const ServerSocket::address() const
 // is OK and if the number of clients does not exceed MAX_CLIENTS
 void ServerSocket::serverCallback()
 {
+	if (clients.size() >= MAX_CLIENTS) {
+		writeln("BYE:Too many clients connected");
+		return;
+	}
+
 	int const client_fd = socktools::accept(fd_);
 
 	if (fd_ == -1) {
@@ -105,11 +109,6 @@ void ServerSocket::serverCallback()
 		return;
 	}
 
-	if (clients.size() >= MAX_CLIENTS) {
-		writeln("BYE:Too many clients connected");
-		return;
-	}
-
 	// Register the new client.
 	clients[client_fd] =
 		shared_ptr<LyXDataSocket>(new LyXDataSocket(client_fd));
@@ -125,14 +124,16 @@ void ServerSocket::serverCallback()
 // if the connection has been closed
 void ServerSocket::dataCallback(int fd)
 {
-	shared_ptr<LyXDataSocket> client = clients[fd];
-
+	map<int, shared_ptr<LyXDataSocket> >::const_iterator it = clients.find(fd);
+	if (it == clients.end())
+		return;
+	shared_ptr<LyXDataSocket> client = it->second;
 	string line;
-	size_t pos;
 	bool saidbye = false;
 	while (!saidbye && client->readln(line)) {
 		// The protocol must be programmed here
 		// Split the key and the data
+		size_t pos;
 		if ((pos = line.find(':')) == string::npos) {
 			client->writeln("ERROR:" + line + ":malformed message");
 			continue;