From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 7CD1238930F7; Fri, 24 Apr 2020 14:23:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7CD1238930F7 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: raw disk I/O: Fix return value in error case X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: 5a7e130c31dfdf78f2e1b30dd6ec39a842be1336 X-Git-Newrev: b8349218955ffbb2b573a2de8efac61a800f4eb0 Message-Id: <20200424142335.7CD1238930F7@sourceware.org> Date: Fri, 24 Apr 2020 14:23:35 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Apr 2020 14:23:35 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=b8349218955ffbb2b573a2de8efac61a800f4eb0 commit b8349218955ffbb2b573a2de8efac61a800f4eb0 Author: Corinna Vinschen Date: Fri Apr 24 16:19:09 2020 +0200 Cygwin: raw disk I/O: Fix return value in error case The cast to generate the return value uses a DWORD variable as test and set value. The error case is the constant -1. Given the type of the other half of the conditioal expression, -1 is cast to DWORD as well. On 64 bit, this results in the error case returning a 32 bit -1 value which is equivalent to (ssize_t) 4294967295 rather than (ssize_t) -1. Add a fixing cast. Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/fhandler_floppy.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/fhandler_floppy.cc b/winsup/cygwin/fhandler_floppy.cc index f2e15d703..778d6ef98 100644 --- a/winsup/cygwin/fhandler_floppy.cc +++ b/winsup/cygwin/fhandler_floppy.cc @@ -619,12 +619,12 @@ fhandler_dev_floppy::raw_write (const void *ptr, size_t len) devbufend = bytes_per_sector; } } - return bytes_written; + return (ssize_t) bytes_written; } /* In O_DIRECT case, just write. */ if (write_file (p, len, &bytes_written, &ret)) - return bytes_written; + return (ssize_t) bytes_written; err: if (IS_EOM (ret)) @@ -635,7 +635,8 @@ err: } else if (!bytes_written) __seterrno (); - return bytes_written ?: -1; + /* Cast is required, otherwise the error return value is (DWORD)-1. */ + return (ssize_t) bytes_written ?: -1; } off_t