CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-10-21 12:42:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix EOF handling for empty DnD transfers

Browse source
This commit is contained in:
Hassan Raza 2026-08-28 14:01:04 +05:00
parent 573488e5a7
commit bd2d09e467
No known key found for this signature in database
2 changed files with 38 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

28
kitty/dnd.c
View file

@ -2121,6 +2121,20 @@ drag_process_item_data(Window *w, size_t idx, int has_more, const uint8_t *paylo
return;
}
// Open temp file if not yet open, including for an empty transfer.
if (!ds.items[idx].fd_plus_one) {
int fd = open_item_tmpfile();
if (fd < 0) {
cancel_drag(w, EIO, "failed to open temporary file to store drag source item data");
return;
}
ds.items[idx].fd_plus_one = fd + 1;
ds.items[idx].data_decode_initialized = true;
ds.items[idx].data_size = 0; // read position for pread
ds.items[idx].data_capacity = 0; // bytes written to file
base64_init_stream_decoder(&ds.items[idx].base64_state);
}
// End of data: has_more == 0 and empty payload
if (has_more == 0 && payload_sz == 0) {
ds.items[idx].data_decode_initialized = false;
@ -2135,20 +2149,6 @@ drag_process_item_data(Window *w, size_t idx, int has_more, const uint8_t *paylo
return;
}
// Open temp file if not yet open
if (!ds.items[idx].fd_plus_one) {
int fd = open_item_tmpfile();
if (fd < 0) {
cancel_drag(w, EIO, "failed to open temporary file to store drag source item data");
return;
}
ds.items[idx].fd_plus_one = fd + 1;
ds.items[idx].data_decode_initialized = true;
ds.items[idx].data_size = 0; // read position for pread
ds.items[idx].data_capacity = 0; // bytes written to file
base64_init_stream_decoder(&ds.items[idx].base64_state);
}
// Decode and write payload data
if (payload_sz > 0) {
RAII_ALLOC(uint8_t, decoded, malloc(payload_sz));

42
kitty_tests/dnd.py
View file

@ -16,6 +16,7 @@ from kitty.fast_data_types import (
dnd_set_test_write_func,
dnd_test_cleanup_fake_window,
dnd_test_create_fake_window,
dnd_test_drag_get_data,
dnd_test_drag_notify,
dnd_test_drop_update_mimes,
dnd_test_fake_drop_data,
@ -2858,24 +2859,26 @@ class TestDnDProtocol(BaseTest):
self.assert_drag_data_complete(cap)
def test_remote_drag_process_item_data_basic(self) -> None:
"""Basic drag_process_item_data: send data for a MIME type after DROPPED state."""
with dnd_test_window() as (screen, cap):
# Set up a non-remote drag with text/plain
parse_bytes(screen, _osc(f'{DND_CODE};t=o:x=1;{machine_id()}'))
parse_bytes(screen, client_drag_offer_mimes(1, 'text/plain'))
cap.consume()
dnd_test_force_drag_dropped(cap.window_id)
dnd_test_request_drag_data(cap.window_id, 0)
# Send data for text/plain (index 0)
b64 = standard_b64encode(b'test data').decode()
parse_bytes(screen, client_drag_send_data(0, b64))
self._assert_no_output(cap)
# End of data
parse_bytes(screen, client_drag_send_data(0, ''))
# Should get a notification (but no error)
events = self._get_events(cap)
for ev in events:
self.assertNotEqual(ev['type'], 'E', f'unexpected error: {ev}')
"""MIME data reads finish at EOF, even when no data was sent."""
for data in (b'', b'test data'):
with self.subTest(data=data), dnd_test_window() as (screen, cap):
parse_bytes(screen, _osc(f'{DND_CODE};t=o:x=1;{machine_id()}'))
parse_bytes(screen, client_drag_offer_mimes(1, 'text/plain'))
cap.consume()
dnd_test_force_drag_dropped(cap.window_id)
with self.assertRaises(OSError) as pending:
dnd_test_drag_get_data(cap.window_id, 'text/plain')
self.assertEqual(pending.exception.errno, errno.EAGAIN)
cap.consume()
if data:
parse_bytes(screen, client_drag_send_data(0, standard_b64encode(data).decode(), more=True))
self.assertEqual(dnd_test_drag_get_data(cap.window_id, 'text/plain'), data)
with self.assertRaises(OSError) as pending:
dnd_test_drag_get_data(cap.window_id, 'text/plain')
self.assertEqual(pending.exception.errno, errno.EAGAIN)
parse_bytes(screen, client_drag_send_data(0, ''))
self.assertEqual(dnd_test_drag_get_data(cap.window_id, 'text/plain'), b'')
self._assert_no_output(cap)
def test_remote_drag_process_item_data_error(self) -> None:
"""Client can report an error via t=E for a MIME data delivery."""
@ -2889,6 +2892,9 @@ class TestDnDProtocol(BaseTest):
parse_bytes(screen, client_drag_send_error(0, 'EPERM'))
# The error should propagate but not crash
cap.consume()
with self.assertRaises(OSError) as failed:
dnd_test_drag_get_data(cap.window_id, 'text/plain')
self.assertEqual(failed.exception.errno, errno.EPERM)
def test_remote_drag_process_item_data_invalid_index(self) -> None:
"""Sending data for a non-existent MIME index is rejected."""