diff options
| author | eadler <eadler@FreeBSD.org> | 2012-03-04 16:39:08 +0000 |
|---|---|---|
| committer | eadler <eadler@FreeBSD.org> | 2012-03-04 16:39:08 +0000 |
| commit | 47d5c92c94b33a3eb80d6efa5f6e811af803179c (patch) | |
| tree | 866b9ecf086f1897f52a6808bdbf7e84a625cea3 | |
| parent | 2c21c36313d7c9853eaca967a13499c5db0100aa (diff) | |
| download | FreeBSD-src-47d5c92c94b33a3eb80d6efa5f6e811af803179c.zip FreeBSD-src-47d5c92c94b33a3eb80d6efa5f6e811af803179c.tar.gz | |
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
| -rw-r--r-- | lib/libc/string/swab.3 | 5 | ||||
| -rw-r--r-- | lib/libc/string/swab.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/libc/string/swab.3 b/lib/libc/string/swab.3 index f8ef34e..0c9deea 100644 --- a/lib/libc/string/swab.3 +++ b/lib/libc/string/swab.3 @@ -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 diff --git a/lib/libc/string/swab.c b/lib/libc/string/swab.c index 1db7d1f..ec6cbf0 100644 --- a/lib/libc/string/swab.c +++ b/lib/libc/string/swab.c @@ -45,6 +45,8 @@ swab(const void * __restrict from, void * __restrict to, ssize_t len) int n; char *fp, *tp; + if (len <= 0) + return; n = len >> 1; fp = (char *)from; tp = (char *)to; |
