diff options
| author | Takashi Yano <takashi.yano@nifty.ne.jp> | 2021-12-08 14:59:05 +0300 |
|---|---|---|
| committer | Takashi Yano <takashi.yano@nifty.ne.jp> | 2021-12-11 17:25:16 +0300 |
| commit | 72175bbd28f65dc3dea875183b9c430018a3400c (patch) | |
| tree | bf7b219fe1b2f9fc3a3769d7f7aa79884887aceb | |
| parent | 5aa2be8ac253f7865b14d87943580303d4f418cd (diff) | |
Cygwin: clipboard: Make intent of the code clearer.
| -rw-r--r-- | winsup/cygwin/fhandler_clipboard.cc | 4 | ||||
| -rw-r--r-- | winsup/cygwin/include/sys/clipboard.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/winsup/cygwin/fhandler_clipboard.cc b/winsup/cygwin/fhandler_clipboard.cc index 05f54ffb3..14820701c 100644 --- a/winsup/cygwin/fhandler_clipboard.cc +++ b/winsup/cygwin/fhandler_clipboard.cc @@ -76,7 +76,7 @@ fhandler_dev_clipboard::set_clipboard (const void *buf, size_t len) clipbuf->cb_sec = clipbuf->ts.tv_sec; #endif clipbuf->cb_size = len; - memcpy (&clipbuf[1], buf, len); // append user-supplied data + memcpy (clipbuf->cb_data, buf, len); // append user-supplied data GlobalUnlock (hmem); EmptyClipboard (); @@ -229,7 +229,7 @@ fhandler_dev_clipboard::read (void *ptr, size_t& len) if (pos < (off_t) clipbuf->cb_size) { ret = (len > (clipbuf->cb_size - pos)) ? clipbuf->cb_size - pos : len; - memcpy (ptr, (char *) (clipbuf + 1) + pos, ret); + memcpy (ptr, clipbuf->cb_data + pos, ret); pos += ret; } } diff --git a/winsup/cygwin/include/sys/clipboard.h b/winsup/cygwin/include/sys/clipboard.h index 4c00c8ea1..932fe98d9 100644 --- a/winsup/cygwin/include/sys/clipboard.h +++ b/winsup/cygwin/include/sys/clipboard.h @@ -44,6 +44,7 @@ typedef struct }; }; uint64_t cb_size; // 8 bytes everywhere + char cb_data[]; } cygcb_t; #endif |