public inbox for cygwin-patches@cygwin.com
 help / color / mirror / Atom feed
From: Thomas Wolff <towo@towo.net>
To: cygwin-patches@cygwin.com
Subject: Re: [PATCH v2] Cygwin: clipboard: Fix a bug in read().
Date: Tue, 7 Dec 2021 21:18:42 +0100	[thread overview]
Message-ID: <c69ec6dd-fbbb-829c-9856-7f34cf0a792e@towo.net> (raw)
In-Reply-To: <Ya9uU1JP8stQOB/l@calimero.vinschen.de>


Am 07.12.2021 um 15:23 schrieb Corinna Vinschen:
> On Dec  7 23:00, Takashi Yano wrote:
>> - Fix a bug in fhandler_dev_clipboard::read() that the second read
>>    fails with 'Bad address'.
>>
>> Addresses:
>>    https://cygwin.com/pipermail/cygwin/2021-December/250141.html
>> ---
>>   winsup/cygwin/fhandler_clipboard.cc | 2 +-
>>   winsup/cygwin/release/3.3.4         | 6 ++++++
>>   2 files changed, 7 insertions(+), 1 deletion(-)
>>   create mode 100644 winsup/cygwin/release/3.3.4
>>
>> diff --git a/winsup/cygwin/fhandler_clipboard.cc b/winsup/cygwin/fhandler_clipboard.cc
>> index 0b87dd352..ae10228a7 100644
>> --- a/winsup/cygwin/fhandler_clipboard.cc
>> +++ b/winsup/cygwin/fhandler_clipboard.cc
>> @@ -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, &clipbuf[1] + pos , ret);
>> +	  memcpy (ptr, (char *) &clipbuf[1] + pos, ret);
> I'm always cringing a bit when I see this kind of expression. Personally
> I think (ptr + offset) is easier to read than &ptr[offset], but of course
> that's just me.  If you agree, would it be ok to change the above to
>
>    (char *) (clipbuf + 1)
>
> while you're at it?  If you like the ampersand expression more, it's ok,
> too, of course.  Please push.
In this specific case I think it's actually more confusing because of 
the type mangling that's intended in the clipbuf.
At quick glance, it looks a bit as if the following were meant:

   (char *) clipbuf + 1


I'd even make it clearer like

+	  memcpy (ptr, ((char *) &clipbuf[1]) + pos, ret);
or even
+	  memcpy (ptr, ((char *) (&clipbuf[1])) + pos, ret);

Thomas

  reply	other threads:[~2021-12-07 20:18 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-07 14:00 Takashi Yano
2021-12-07 14:23 ` Corinna Vinschen
2021-12-07 20:18   ` Thomas Wolff [this message]
2021-12-08  5:53     ` Brian Inglis
2021-12-08  6:30       ` Mark Geisert
2021-12-08  7:24         ` Brian Inglis
2021-12-08  8:19         ` Takashi Yano
2021-12-08  9:43           ` Mark Geisert
2021-12-08 10:19             ` Corinna Vinschen
2021-12-08 18:46               ` Thomas Wolff

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c69ec6dd-fbbb-829c-9856-7f34cf0a792e@towo.net \
    --to=towo@towo.net \
    --cc=cygwin-patches@cygwin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).