Переглянути джерело

Seal clipboard buffers after copying data into them.

This is just a quick safety mechanism to ensure that nobody alters the
contents of a clipping after it's been set.

Ultimately this will be replaced by a more sophisticated SHM object.
Andreas Kling 6 роки тому
батько
коміт
b8581b0069
2 змінених файлів з 2 додано та 0 видалено
  1. 1 0
      LibGUI/GClipboard.cpp
  2. 1 0
      WindowServer/WSClientConnection.cpp

+ 1 - 0
LibGUI/GClipboard.cpp

@@ -44,6 +44,7 @@ void GClipboard::set_data(const String& data)
         return;
     }
     memcpy(shared_buffer->data(), data.characters(), data.length() + 1);
+    shared_buffer->seal();
     request.clipboard.shared_buffer_id = shared_buffer->shared_buffer_id();
     request.clipboard.contents_size = data.length();
     auto response = GEventLoop::main().sync_request(request, WSAPI_ServerMessage::Type::DidSetClipboardContents);

+ 1 - 0
WindowServer/WSClientConnection.cpp

@@ -336,6 +336,7 @@ void WSClientConnection::handle_request(WSAPIGetClipboardContentsRequest&)
         RetainPtr<SharedBuffer> shared_buffer = SharedBuffer::create(m_pid, WSClipboard::the().size());
         ASSERT(shared_buffer);
         memcpy(shared_buffer->data(), WSClipboard::the().data(), WSClipboard::the().size());
+        shared_buffer->seal();
         response.clipboard.shared_buffer_id = shared_buffer->shared_buffer_id();
         response.clipboard.contents_size = WSClipboard::the().size();