Merge branch 'master' of https://github.com/grodansparadis/vscp_software

grodansparadis · Mar 24, 2015 · 998fc2c · 998fc2c
2 parents 23d6262 + 7e82212
commit 998fc2c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/vscp/common/tcpipclientthread.cpp b/src/vscp/common/tcpipclientthread.cpp
@@ -828,6 +828,8 @@ void VSCPClientThread::handleClientSend( struct ns_connection *conn, CControlObj
 
             unsigned int index = 0;
 
+			event.pdata = new uint8_t[ event.sizeData ];
+
             if ( NULL == event.pdata ) {
                 ns_send( conn, MSG_INTERNAL_MEMORY_ERROR, strlen( MSG_INTERNAL_MEMORY_ERROR ) );
                 return;

diff --git a/src/vscp/common/vscpremotetcpif.cpp b/src/vscp/common/vscpremotetcpif.cpp
@@ -632,7 +632,9 @@ int VscpRemoteTcpIf::doCmdSend( const vscpEvent *pEvent )
         strBuf += strGUID;
     }
 
-    strBuf += _(",");
+    if ( 0 < pEvent->sizeData ) {
+        strBuf += _(",");
+    }
 
     // Data
     for ( i=0; i<pEvent->sizeData; i++ ) {
@@ -705,7 +707,9 @@ int VscpRemoteTcpIf::doCmdSendEx( const vscpEventEx *pEvent )
         strBuf += strGUID;
     }
 
-    strBuf += _(",");
+    if ( 0 < pEvent->sizeData ) {
+        strBuf += _(",");
+    }
 
     // Data
     for ( i=0; i<pEvent->sizeData; i++ ) {