From owner-svn-src-all@FreeBSD.ORG  Sat Apr 21 07:31:28 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 81BFA1065672;
	Sat, 21 Apr 2012 07:31:28 +0000 (UTC) (envelope-from das@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6D2248FC14;
	Sat, 21 Apr 2012 07:31:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3L7VSWj077242;
	Sat, 21 Apr 2012 07:31:28 GMT (envelope-from das@svn.freebsd.org)
Received: (from das@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3L7VSQp077240;
	Sat, 21 Apr 2012 07:31:28 GMT (envelope-from das@svn.freebsd.org)
Message-Id: <201204210731.q3L7VSQp077240@svn.freebsd.org>
From: David Schultz <das@FreeBSD.org>
Date: Sat, 21 Apr 2012 07:31:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234536 - head/lib/libc/stdio
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Apr 2012 07:31:28 -0000

Author: das
Date: Sat Apr 21 07:31:27 2012
New Revision: 234536
URL: http://svn.freebsd.org/changeset/base/234536

Log:
  As noted by Peter Jeremy, r234528 only partially fixed the infinite
  loop bug introduced in r187302.  This completes the fix.
  
  PR:		167039
  MFC after:	3 days

Modified:
  head/lib/libc/stdio/fputws.c

Modified: head/lib/libc/stdio/fputws.c
==============================================================================
--- head/lib/libc/stdio/fputws.c	Sat Apr 21 07:00:39 2012	(r234535)
+++ head/lib/libc/stdio/fputws.c	Sat Apr 21 07:31:27 2012	(r234536)
@@ -61,8 +61,8 @@ fputws_l(const wchar_t * __restrict ws, 
 	uio.uio_iov = &iov;
 	uio.uio_iovcnt = 1;
 	iov.iov_base = buf;
+	wsp = ws;
 	do {
-		wsp = ws;
 		nbytes = l->__wcsnrtombs(buf, &wsp, SIZE_T_MAX, sizeof(buf),
 		    &fp->_mbstate);
 		if (nbytes == (size_t)-1)