From owner-svn-src-stable@FreeBSD.ORG  Tue Apr 24 03:59:22 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7B561106566B;
	Tue, 24 Apr 2012 03:59:22 +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 668998FC14;
	Tue, 24 Apr 2012 03:59:22 +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 q3O3xMNI029429;
	Tue, 24 Apr 2012 03:59:22 GMT (envelope-from das@svn.freebsd.org)
Received: (from das@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3O3xMP2029427;
	Tue, 24 Apr 2012 03:59:22 GMT (envelope-from das@svn.freebsd.org)
Message-Id: <201204240359.q3O3xMP2029427@svn.freebsd.org>
From: David Schultz <das@FreeBSD.org>
Date: Tue, 24 Apr 2012 03:59:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234635 - stable/9/lib/libc/stdio
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Apr 2012 03:59:22 -0000

Author: das
Date: Tue Apr 24 03:59:21 2012
New Revision: 234635
URL: http://svn.freebsd.org/changeset/base/234635

Log:
  MFC r234529:
    Ensure that the {,v}swprintf functions always null-terminate the
    output string, even if an encoding error or malloc failure occurs.

Modified:
  stable/9/lib/libc/stdio/vswprintf.c
Directory Properties:
  stable/9/lib/libc/   (props changed)

Modified: stable/9/lib/libc/stdio/vswprintf.c
==============================================================================
--- stable/9/lib/libc/stdio/vswprintf.c	Tue Apr 24 03:59:18 2012	(r234634)
+++ stable/9/lib/libc/stdio/vswprintf.c	Tue Apr 24 03:59:21 2012	(r234635)
@@ -59,6 +59,7 @@ vswprintf(wchar_t * __restrict s, size_t
 	f._bf._base = f._p = (unsigned char *)malloc(128);
 	if (f._bf._base == NULL) {
 		errno = ENOMEM;
+		*s = L'\0';
 		return (-1);
 	}
 	f._bf._size = f._w = 127;		/* Leave room for the NUL */
@@ -67,6 +68,7 @@ vswprintf(wchar_t * __restrict s, size_t
 		sverrno = errno;
 		free(f._bf._base);
 		errno = sverrno;
+		*s = L'\0';
 		return (-1);
 	}
 	*f._p = '\0';
@@ -80,6 +82,7 @@ vswprintf(wchar_t * __restrict s, size_t
 	free(f._bf._base);
 	if (nwc == (size_t)-1) {
 		errno = EILSEQ;
+		*s = L'\0';
 		return (-1);
 	}
 	if (nwc == n) {