From owner-svn-src-stable-7@FreeBSD.ORG  Mon Mar 19 01:28:11 2012
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E4F55106564A;
	Mon, 19 Mar 2012 01:28:11 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CFC988FC12;
	Mon, 19 Mar 2012 01:28:11 +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 q2J1SBPR044608;
	Mon, 19 Mar 2012 01:28:11 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2J1SBuC044605;
	Mon, 19 Mar 2012 01:28:11 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201203190128.q2J1SBuC044605@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 19 Mar 2012 01:28:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233148 - stable/7/lib/libc/string
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Mar 2012 01:28:12 -0000

Author: eadler
Date: Mon Mar 19 01:28:11 2012
New Revision: 233148
URL: http://svn.freebsd.org/changeset/base/233148

Log:
  MFC r232503:
  	POSIX mandates that swab do nothing when len < 0
  
  PR:		140690
  Approved by:	cperciva

Modified:
  stable/7/lib/libc/string/swab.3
  stable/7/lib/libc/string/swab.c
Directory Properties:
  stable/7/lib/libc/   (props changed)

Modified: stable/7/lib/libc/string/swab.3
==============================================================================
--- stable/7/lib/libc/string/swab.3	Mon Mar 19 01:27:55 2012	(r233147)
+++ stable/7/lib/libc/string/swab.3	Mon Mar 19 01:28:11 2012	(r233148)
@@ -28,7 +28,7 @@
 .\"     @(#)swab.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd December 10, 2004
+.Dd March 4, 2012
 .Dt SWAB 3
 .Os
 .Sh NAME
@@ -54,6 +54,9 @@ swapping adjacent bytes.
 The argument
 .Fa len
 must be an even number.
+If
+.Fa len
+is less than zero, nothing will be done.
 .Sh SEE ALSO
 .Xr bzero 3 ,
 .Xr memset 3

Modified: stable/7/lib/libc/string/swab.c
==============================================================================
--- stable/7/lib/libc/string/swab.c	Mon Mar 19 01:27:55 2012	(r233147)
+++ stable/7/lib/libc/string/swab.c	Mon Mar 19 01:28:11 2012	(r233148)
@@ -45,6 +45,8 @@ swab(const void * __restrict from, void 
 	int n;
 	char *fp, *tp;
 
+	if (len <= 0)
+		return;
 	n = len >> 1;
 	fp = (char *)from;
 	tp = (char *)to;