From owner-svn-src-all@FreeBSD.ORG Fri Jul 25 03:24:02 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3323B6D6; Fri, 25 Jul 2014 03:24:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 065B22962; Fri, 25 Jul 2014 03:24:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6P3O1qw071228; Fri, 25 Jul 2014 03:24:01 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6P3O1Nb071222; Fri, 25 Jul 2014 03:24:01 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201407250324.s6P3O1Nb071222@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Fri, 25 Jul 2014 03:24:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r269085 - stable/10/lib/libc/stdio X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jul 2014 03:24:02 -0000 Author: pfg Date: Fri Jul 25 03:24:00 2014 New Revision: 269085 URL: http://svnweb.freebsd.org/changeset/base/269085 Log: MFC r268985, r269001: Avoid possible cast degradation. Assign iov_len first, avoiding the cast to uio_resid (int in stdio) from degrading the value. Small cosmetical fix while here. Modified: stable/10/lib/libc/stdio/fputs.c stable/10/lib/libc/stdio/fputws.c stable/10/lib/libc/stdio/puts.c stable/10/lib/libc/stdio/putw.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/stdio/fputs.c ============================================================================== --- stable/10/lib/libc/stdio/fputs.c Fri Jul 25 01:29:22 2014 (r269084) +++ stable/10/lib/libc/stdio/fputs.c Fri Jul 25 03:24:00 2014 (r269085) @@ -55,7 +55,7 @@ fputs(const char * __restrict s, FILE * struct __siov iov; iov.iov_base = (void *)s; - iov.iov_len = uio.uio_resid = strlen(s); + uio.uio_resid = iov.iov_len = strlen(s); uio.uio_iov = &iov; uio.uio_iovcnt = 1; FLOCKFILE(fp); Modified: stable/10/lib/libc/stdio/fputws.c ============================================================================== --- stable/10/lib/libc/stdio/fputws.c Fri Jul 25 01:29:22 2014 (r269084) +++ stable/10/lib/libc/stdio/fputws.c Fri Jul 25 03:24:00 2014 (r269085) @@ -67,7 +67,7 @@ fputws_l(const wchar_t * __restrict ws, &fp->_mbstate); if (nbytes == (size_t)-1) goto error; - iov.iov_len = uio.uio_resid = nbytes; + uio.uio_resid = iov.iov_len = nbytes; if (__sfvwrite(fp, &uio) != 0) goto error; } while (wsp != NULL); Modified: stable/10/lib/libc/stdio/puts.c ============================================================================== --- stable/10/lib/libc/stdio/puts.c Fri Jul 25 01:29:22 2014 (r269084) +++ stable/10/lib/libc/stdio/puts.c Fri Jul 25 03:24:00 2014 (r269085) @@ -51,12 +51,12 @@ int puts(char const *s) { int retval; - size_t c = strlen(s); + size_t c; struct __suio uio; struct __siov iov[2]; iov[0].iov_base = (void *)s; - iov[0].iov_len = c; + iov[0].iov_len = c = strlen(s); iov[1].iov_base = "\n"; iov[1].iov_len = 1; uio.uio_resid = c + 1; Modified: stable/10/lib/libc/stdio/putw.c ============================================================================== --- stable/10/lib/libc/stdio/putw.c Fri Jul 25 01:29:22 2014 (r269084) +++ stable/10/lib/libc/stdio/putw.c Fri Jul 25 03:24:00 2014 (r269085) @@ -50,7 +50,7 @@ putw(int w, FILE *fp) struct __siov iov; iov.iov_base = &w; - iov.iov_len = uio.uio_resid = sizeof(w); + uio.uio_resid = iov.iov_len = sizeof(w); uio.uio_iov = &iov; uio.uio_iovcnt = 1; FLOCKFILE(fp);