CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-05-13 08:26:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix failing test
Some checks are pending
CI / Linux (python=3.13 cc=clang sanitize=1) (push) Waiting to run
Details
CI / Linux (python=3.11 cc=gcc sanitize=0) (push) Waiting to run
Details
CI / Linux (python=3.12 cc=gcc sanitize=1) (push) Waiting to run
Details
CI / Linux package (push) Waiting to run
Details
CI / Bundle test (macos-latest) (push) Waiting to run
Details
CI / Bundle test (ubuntu-latest) (push) Waiting to run
Details
CI / macOS Brew (push) Waiting to run
Details
CI / Test ./dev.sh and benchmark (push) Waiting to run
Details
CodeQL / CodeQL-Build (actions, ubuntu-latest) (push) Waiting to run
Details
CodeQL / CodeQL-Build (c, macos-latest) (push) Waiting to run
Details
CodeQL / CodeQL-Build (c, ubuntu-latest) (push) Waiting to run
Details
CodeQL / CodeQL-Build (go, ubuntu-latest) (push) Waiting to run
Details
CodeQL / CodeQL-Build (python, ubuntu-latest) (push) Waiting to run
Details
Depscan / Scan dependencies for vulnerabilities (push) Waiting to run
Details

Browse source 
Ensure we never write empty payloads for symlinks/dir listings
This commit is contained in:
Kovid Goyal 2026-05-12 12:52:04 +05:30
parent 2bda489698
commit b9261c4e26
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kittens/dnd/drag.go
View file

@ -392,7 +392,9 @@ func (dnd *dnd) send_remote_dir(path string, idx_in_uri_list, parent_dir_handle,
names = append(names, entry.Name())
}
payload := utils.UnsafeStringToBytes(strings.Join(names, "\x00"))
dnd.send_remote_item_payload(parent_dir_handle, idx, idx_in_uri_list, handle, payload)
if len(payload) > 0 {
dnd.send_remote_item_payload(parent_dir_handle, idx, idx_in_uri_list, handle, payload)
}
dnd.drag_status.remote_item_write_id = dnd.send_remote_item_payload(parent_dir_handle, idx, idx_in_uri_list, handle, nil)
return
}
@ -403,7 +405,9 @@ func (dnd *dnd) send_remote_symlink(path string, idx_in_uri_list, parent_dir_han
dnd.finish_drag("EIO")
return err
}
dnd.send_remote_item_payload(parent_dir_handle, idx, idx_in_uri_list, 1, utils.UnsafeStringToBytes(target))
if len(target) > 0 {
dnd.send_remote_item_payload(parent_dir_handle, idx, idx_in_uri_list, 1, utils.UnsafeStringToBytes(target))
}
dnd.drag_status.remote_item_write_id = dnd.send_remote_item_payload(parent_dir_handle, idx, idx_in_uri_list, 1, nil)
return
}

2
kitty/dnd.c
View file

@ -2154,7 +2154,7 @@ drag_remote_file_data(
mime_item_idx = i; break;
}
}
if (mime_item_idx == ds.num_mimes) abrt(EINVAL, "drag source no text/uri-list MIME entry data was requested");
if (mime_item_idx == ds.num_mimes) abrt(EINVAL, "drag source no remote data was requested");
if (x < 1) abrt(EINVAL, "drag source remote item x index cannot be less than 1");
const bool all_data_received = !payload_sz && !has_more;
const unsigned uri_item_idx = x - 1;