From 7824e27c79525cedd1525daf8c693a29430d731d Mon Sep 17 00:00:00 2001
From: Fred Gleason <fredg@paravelsystems.com>
Date: Thu, 20 Jun 2019 13:01:38 -0400
Subject: [PATCH] 2019-06-20 Fred Gleason <fredg@paravelsystems.com> 	*
 Refactored the 'CaeServer::readyReadData()' method in 	caed(8) for greater
 reiliency.

---
 ChangeLog          |  3 +++
 cae/cae_server.cpp | 18 ++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c63f3672..63eab6fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18790,3 +18790,6 @@
 2019-06-19 Fred Gleason <fredg@paravelsystems.com>
 	* Fixed a regression that caused a compilation error when
 	rebuilding the Docbook 5 documentation.
+2019-06-20 Fred Gleason <fredg@paravelsystems.com>
+	* Refactored the 'CaeServer::readyReadData()' method in
+	caed(8) for greater reiliency.
diff --git a/cae/cae_server.cpp b/cae/cae_server.cpp
index b5fe585e..eee8b8d3 100644
--- a/cae/cae_server.cpp
+++ b/cae/cae_server.cpp
@@ -159,13 +159,19 @@ void CaeServer::readyReadData(int id)
   QByteArray data=cae_connections.value(id)->socket->readAll();
   for(int i=0;i<data.size();i++) {
     char c=0xFF&data[i];
-    if(c=='!') {
+    switch(c) {
+    case '!':
       ProcessCommand(id,cae_connections.value(id)->accum);
-    }
-    else {
-      if(isalnum(0xFF&data[i])||(c=='_')||(c=='-')||(c==' ')) {
-	cae_connections.value(id)->accum+=0xFF&data[i];
-      }
+      cae_connections.value(id)->accum="";
+      break;
+
+    case 10:
+    case 13:
+      break;
+
+    default:
+      cae_connections.value(id)->accum+=c;
+      break;
     }
   }
 }