Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Fix `write_to_clipboard` on Windows when string contains embedded nulls (#64911)

John Turdecbf641b18f
diff --git a/crates/gpui_windows/src/clipboard.rs b/crates/gpui_windows/src/clipboard.rs
index cd0694ab315..11eb2a8129b 100644
--- a/crates/gpui_windows/src/clipboard.rs
+++ b/crates/gpui_windows/src/clipboard.rs
@@ -1,4 +1,4 @@
-use std::sync::LazyLock;
+use std::{borrow::Cow, sync::LazyLock};
use anyhow::Result;
use collections::FxHashMap;
@@ -178,11 +178,17 @@ fn is_image_format(format: u32) -> bool {
}
fn write_string(item: &ClipboardString) -> Result<()> {
- let wide: Vec<u16> = item.text.encode_utf16().chain(Some(0)).collect_vec();
+ // CF_UNICODETEXT is null-terminated, so replace embedded NUL characters with spaces.
+ let text = if item.text.contains('\0') {
+ Cow::Owned(item.text.replace('\0', " "))
+ } else {
+ Cow::Borrowed(item.text.as_str())
+ };
+ let wide: Vec<u16> = text.encode_utf16().chain(Some(0)).collect_vec();
set_clipboard_bytes(&wide, CF_UNICODETEXT.0 as u32)?;
if let Some(metadata) = item.metadata.as_ref() {
- let hash_bytes = ClipboardString::text_hash(&item.text).to_ne_bytes();
+ let hash_bytes = ClipboardString::text_hash(&text).to_ne_bytes();
set_clipboard_bytes(&hash_bytes, *CLIPBOARD_HASH_FORMAT)?;
let wide: Vec<u16> = metadata.encode_utf16().chain(Some(0)).collect_vec();
diff --git a/crates/gpui_windows/src/platform.rs b/crates/gpui_windows/src/platform.rs
index 348aaa3f23f..05995079e92 100644
--- a/crates/gpui_windows/src/platform.rs
+++ b/crates/gpui_windows/src/platform.rs
@@ -1756,5 +1756,16 @@ mod tests {
let item = ClipboardItem::new_string_with_json_metadata("abcdef".to_string(), vec![3, 4]);
write_to_clipboard(item.clone());
assert_eq!(read_from_clipboard(), Some(item));
+
+ let item =
+ ClipboardItem::new_string_with_json_metadata("before\0after".to_string(), vec![12]);
+ write_to_clipboard(item);
+ assert_eq!(
+ read_from_clipboard(),
+ Some(ClipboardItem::new_string_with_json_metadata(
+ "before after".to_string(),
+ vec![12],
+ )),
+ );
}
}