Fix some local->remote clipboard merge misses

common/rfb/SConnection.cxx

@@ -296,8 +296,10 @@ void SConnection::setEncodings(int nEncodings, const rdr::S32* encodings)
   }
 }
 
-void SConnection::clientCutText(const char* str)
+void SConnection::clientCutText(const char* str, int len)
 {
+  hasLocalClipboard = false;
+
   strFree(clientClipboard);
   clientClipboard = NULL;
 
@@ -328,10 +330,12 @@ void SConnection::handleClipboardNotify(rdr::U32 flags)
   strFree(clientClipboard);
   clientClipboard = NULL;
 
-  if (flags & rfb::clipboardUTF8)
+  if (flags & rfb::clipboardUTF8) {
     handleClipboardAnnounce(true);
-  else
+    hasLocalClipboard = false;
+  } else {
     handleClipboardAnnounce(false);
+  }
 }
 
 void SConnection::handleClipboardProvide(rdr::U32 flags,

common/rfb/SConnection.h

@@ -73,7 +73,7 @@ namespace rfb {
 
     virtual void setEncodings(int nEncodings, const rdr::S32* encodings);
 
-    virtual void clientCutText(const char* str);
+    virtual void clientCutText(const char* str, int len);
 
     virtual void handleClipboardRequest(rdr::U32 flags);
     virtual void handleClipboardPeek(rdr::U32 flags);

common/rfb/VNCSConnectionST.cxx

@@ -1016,7 +1016,7 @@ void VNCSConnectionST::handleClipboardAnnounce(bool available)
   server->handleClipboardAnnounce(this, available);
 }
 
-void VNCSConnectionST::handleClipboardData(const char* data)
+void VNCSConnectionST::handleClipboardData(const char* data, int len)
 {
   if (!(accessRights & AccessCutText)) return;
   if (!rfb::Server::acceptCutText) return;
@@ -1025,7 +1025,6 @@ void VNCSConnectionST::handleClipboardData(const char* data)
               sock->getPeerAddress());
     return;
   }
-  int len = strlen(data);
   const int origlen = len;
   if (rfb::Server::DLP_ClipAcceptMax && len > rfb::Server::DLP_ClipAcceptMax)
     len = rfb::Server::DLP_ClipAcceptMax;

common/rfb/VNCSConnectionST.h

@@ -185,7 +185,7 @@ namespace rfb {
                                          int x, int y, int w, int h);
     virtual void handleClipboardRequest();
     virtual void handleClipboardAnnounce(bool available);
-    virtual void handleClipboardData(const char* data);
+    virtual void handleClipboardData(const char* data, int len);
     virtual void supportsLocalCursor();
     virtual void supportsFence();
     virtual void supportsContinuousUpdates();

common/rfb/VNCServerST.cxx

@@ -535,7 +535,7 @@ void VNCServerST::sendClipboardData(const char* data)
   for (ci = clipboardRequestors.begin();
        ci != clipboardRequestors.end(); ci = ci_next) {
     ci_next = ci; ci_next++;
-    (*ci)->sendClipboardData(data, strlen(data));
+    (*ci)->sendClipboardDataOrClose(data);
   }
 
   clipboardRequestors.clear();