Error checking, no longer passing message as reference for more thread safety

Author: robotconscience

libs/ofxLibwebsockets/include/ofxLibwebsockets/Events.h

@@ -16,10 +16,10 @@ namespace ofxLibwebsockets {
 
     class Event {
     public:
-        Event(Connection& _conn, std::string& _message, bool isBinary=false);
+        Event(Connection& _conn, std::string _message, bool isBinary=false);
 
         Connection& conn;
-        std::string& message; // message from ws OR error message if error
+        std::string message; // message from ws OR error message if error
         Json::Value json;
 
         // binary data

libs/ofxLibwebsockets/src/Connection.cpp

@@ -31,6 +31,10 @@ namespace ofxLibwebsockets {
     Connection::~Connection(){
         free(buf);
         free(binaryBuf);
+        
+        // delete all pending frames
+        messages_binary.clear();
+        messages_text.clear();
     }
     //--------------------------------------------------------------
     void Connection::close() {
@@ -194,8 +198,10 @@ namespace ofxLibwebsockets {
     void Connection::setIdle( bool isIdle ){
         idle = isIdle;
         static string dum ="";
-        Event args(*this, dum);
-        ofNotifyEvent(protocol->onidleEvent, args);
+        if ( protocol != NULL ){
+            Event args(*this, dum);
+            ofNotifyEvent(protocol->onidleEvent, args);
+        }
     }
 
     //--------------------------------------------------------------

libs/ofxLibwebsockets/src/Events.cpp

@@ -10,7 +10,7 @@
 namespace ofxLibwebsockets {
 
     //--------------------------------------------------------------
-    Event::Event(Connection& _conn, std::string& _message, bool isBinary)
+    Event::Event(Connection& _conn, std::string _message, bool isBinary)
     : conn(_conn)
     , message(_message)
     , isBinary(isBinary)

libs/ofxLibwebsockets/src/Reactor.cpp

@@ -105,7 +105,7 @@ namespace ofxLibwebsockets {
 
         // this happens with events that don't use the connection
         // so not always a problem
-        if (conn == NULL || conn->protocol == NULL){
+        if (conn == NULL || conn->protocol == NULL || conn->ws == NULL ){
             if (conn == NULL){
                 ofLog(OF_LOG_WARNING, "[ofxLibwebsockets] connection is null ");
             } else {