diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2023-07-30 11:17:31 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2023-07-30 11:17:31 +0000 |
| commit | 89d0fe561f733ed54e31256c4c411afc9e9000f6 (patch) | |
| tree | 3199d56c7eca813a69c0bd57aa5deee8da2b6c71 /selection.c | |
| parent | meson: bump version to 1.15.1 (diff) | |
| parent | --window-size-chars: ensure width/height are valid for current scaling factor (diff) | |
Merge branch 'master' into releases/1.15
Diffstat (limited to 'selection.c')
| -rw-r--r-- | selection.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/selection.c b/selection.c index f6349d7f..d1a7ea28 100644 --- a/selection.c +++ b/selection.c @@ -1662,7 +1662,7 @@ send_clipboard_or_primary(struct seat *seat, int fd, const char *selection, return; } - size_t len = strlen(selection); + size_t len = selection != NULL ? strlen(selection) : 0; size_t async_idx = 0; switch (async_write(fd, selection, len, &async_idx)) { @@ -1701,7 +1701,6 @@ send(void *data, struct wl_data_source *wl_data_source, const char *mime_type, struct seat *seat = data; const struct wl_clipboard *clipboard = &seat->clipboard; - xassert(clipboard->text != NULL); send_clipboard_or_primary(seat, fd, clipboard->text, "clipboard"); } @@ -1756,7 +1755,6 @@ primary_send(void *data, struct seat *seat = data; const struct wl_primary *primary = &seat->primary; - xassert(primary->text != NULL); send_clipboard_or_primary(seat, fd, primary->text, "primary"); } |
