From owner-svn-src-all@FreeBSD.ORG  Sun Mar  4 16:39:09 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 0936B106564A;
	Sun,  4 Mar 2012 16:39:09 +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 ECCAE8FC12;
	Sun,  4 Mar 2012 16:39:08 +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 q24Gd8s9043390;
	Sun, 4 Mar 2012 16:39:08 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q24Gd8dJ043387;
	Sun, 4 Mar 2012 16:39:08 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201203041639.q24Gd8dJ043387@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 4 Mar 2012 16:39:08 +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: r232503 - head/lib/libc/string
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: Sun, 04 Mar 2012 16:39:09 -0000

Author: eadler
Date: Sun Mar  4 16:39:08 2012
New Revision: 232503
URL: http://svn.freebsd.org/changeset/base/232503

Log:
  POSIX mandates that swab do nothing when len < 0
  
  PR:		kern/140690
  Submitted by:	Jeremy Huddleston <jeremyhu@apple.com>
  Approved by:	cperciva
  MFC after:	2 weeks

Modified:
  head/lib/libc/string/swab.3
  head/lib/libc/string/swab.c

Modified: head/lib/libc/string/swab.3
==============================================================================
--- head/lib/libc/string/swab.3	Sun Mar  4 16:37:44 2012	(r232502)
+++ head/lib/libc/string/swab.3	Sun Mar  4 16:39:08 2012	(r232503)
@@ -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: head/lib/libc/string/swab.c
==============================================================================
--- head/lib/libc/string/swab.c	Sun Mar  4 16:37:44 2012	(r232502)
+++ head/lib/libc/string/swab.c	Sun Mar  4 16:39:08 2012	(r232503)
@@ -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;