From 7e43656c5c4c5ce21da0312e2accf89db1f310fe Mon Sep 17 00:00:00 2001
From: Brad Arant <brad.arant@softvision.com>
Date: Wed, 22 Sep 2021 18:08:56 -0700
Subject: [PATCH] Zero buffer for test before buffer read.

---
 Socket.cpp | 127 +++++++++++++++++++++++++++--------------------------
 1 file changed, 65 insertions(+), 62 deletions(-)

diff --git a/Socket.cpp b/Socket.cpp
index 0e6f22c..ba4ce6f 100644
--- a/Socket.cpp
+++ b/Socket.cpp
@@ -5,27 +5,27 @@
 #include "Log.h"
 
 namespace core {
-
+   
    Socket::Socket(EPoll &ePoll, std::string text) : ePoll(ePoll), text(text) {
       coreutils::Log(coreutils::LOG_DEBUG_2) << "Socket object created [" << text << "].";
       buffer = (char *)malloc(4096);
       length = 4096;
    }
-
+   
    Socket::~Socket() {
       free(buffer);
       if(descriptor == -1)
-	     return;
+	return;
       onUnregister();
       ePoll.unregisterSocket(this);
       coreutils::Log(coreutils::LOG_DEBUG_3) << "Socket destroyed for socket " << descriptor << ".";
       close(descriptor);
    }
-
+   
    void Socket::setDescriptor(int descriptor) {
       if((descriptor == -1) && (errno == 24)) {
-	      shutdown("Too many files open");
-	      throw coreutils::Exception("Too many files open. Refusing connection.");
+	 shutdown("Too many files open");
+	 throw coreutils::Exception("Too many files open. Refusing connection.");
       }
       lock.lock();
       coreutils::Log(coreutils::LOG_DEBUG_3) << "Descriptor set to " << descriptor << " for Socket.";
@@ -37,116 +37,119 @@ namespace core {
       onRegistered();
       lock.unlock();
    }
-
+   
    int Socket::getDescriptor() {
       return descriptor;
    }
-
+   
    void Socket::setBufferSize(int length) {
       this->length = length;
       buffer = (char *)realloc(buffer, length);
-
+      
    }
-
+   
    int Socket::getBufferSize() {
       return length;
    }
-
+   
    void Socket::onRegister() {}
-
+   
    void Socket::onRegistered() {}
-
+   
    void Socket::onUnregister() {}
-
+   
    void Socket::onUnregistered() {}
-
+   
    bool Socket::eventReceived(struct epoll_event event) {
-
+      
       lock.lock();
-
+      
       if(event.events & EPOLLRDHUP) {
          readHangup = true;
          shutdown("hangup received");
-      	lock.unlock();
+	 lock.unlock();
          return false;
       }
-
+      
       if(event.events & EPOLLIN) {
          coreutils::ZString zbuffer(buffer, length);
-     	   receiveData(zbuffer);
+	 receiveData(zbuffer);
       }
-
+      
       if(event.events & EPOLLWRNORM) {
-	      writeSocket();
+	 writeSocket();
       }
-
+      
       if(event.events & EPOLLHUP) {
          shutdown();
-	      lock.unlock();
-	      return false;
+	 lock.unlock();
+	 return false;
       }
-
+      
       lock.unlock();
-
+      
       reset = true;
       return reset;
    }
-
+   
    void Socket::onDataReceived(std::string data) {
       throw coreutils::Exception("Need to override onDataReceived.", __FILE__, __LINE__, -1);
    }
-
+   
    void Socket::onDataReceived(coreutils::ZString &data) {
       onDataReceived(std::string(data.getData(), data.getLength()));
    }
-
+   
    void Socket::receiveData(coreutils::ZString &buffer) {
-
+      
       coreutils::ZString blank("");
-
+      
       if(buffer.getLength() <= 0)
         throw coreutils::Exception("Request to receive data with a zero buffer length.", __FILE__, __LINE__, -1);
-
+      
       int len;
       int error = -1;
+      
+      for(int ix = 0; ix < buffer.getLength(); ++ix)
+        buffer[ix] = 0;
 
       if((len = ::read(getDescriptor(), buffer.getData(), buffer.getLength())) >= 0) {
          coreutils::ZString zbuffer(buffer.getData(), len);
-    	   onDataReceived(zbuffer);
+	      onDataReceived(zbuffer);
       }
       else {
-
-   	   error = errno;
-
-	      switch (error) {
-
-	         // When a listening socket receives a connection
-	         // request we get one of these.
-           	//
-	       case ENOTCONN:
+	 
+	 error = errno;
+	 
+	 switch (error) {
+	    
+	    // When a listening socket receives a connection
+	    // request we get one of these.
+	    //
+	  case ENOTCONN:
             onDataReceived(blank);
-           break;
-
-   	    case ECONNRESET:
+	    break;
+	    
+	  case ECONNRESET:
             break;
-
-   	    default:
+	    
+	  default:
             throw coreutils::Exception("Error in read of data from socket.", __FILE__, __LINE__, error);
-   	   }
+	 }
       }
    }
-
+   
    void Socket::writeSocket() {
       if(fifo.size() > 0) {
-   	   outlock.lock();
+	 outlock.lock();
          ::write(descriptor, fifo.front().c_str(), fifo.front().length());
          fifo.pop();
-	      if(shutDown && !needsToWrite())
-	        delete this;
-	      outlock.unlock();
+	 if(shutDown && !needsToWrite())
+	   delete this;
+	 outlock.unlock();
       }
    }
-
+   
    int Socket::write(std::string data) {
       outlock.lock();
       fifo.emplace(data);
@@ -154,22 +157,22 @@ namespace core {
       ePoll.resetSocket(this);
       return 1;
    }
-
+   
    void Socket::output(std::stringstream &out) {
       out << "|" << descriptor << "|";
    }
-
+   
    bool Socket::needsToWrite() {
       return fifo.size() > 0;
    }
-
+   
    void Socket::shutdown(std::string text) {
       coreutils::Log(coreutils::LOG_DEBUG_2) << "Shutdown requested on socket " << descriptor << " with reason " << text << ".";
       shutDown = true;
       reset = false;
-//      if(!needsToWrite())
-   	  delete this;
-
+      //      if(!needsToWrite())
+      delete this;
+      
    }
-
+   
 }