diff options
| author |   deraadt <deraadt@openbsd.org> | 2019-06-28 05:44:09 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2019-06-28 05:44:09 +0000 |
| commit | 7d5bbbe355add9c0be6e56c06f1818bf2448d48c (patch) | |
| tree | 6c42284d37e7d3cc246c5d1019a9695b374f2df7 /usr.bin/file | |
| parent | mkstemp() returns -1 on failure (diff) | |
| download | wireguard-openbsd-7d5bbbe355add9c0be6e56c06f1818bf2448d48c.tar.xz wireguard-openbsd-7d5bbbe355add9c0be6e56c06f1818bf2448d48c.zip | |
asprintf returns -1, not an arbitrary value < 0. Also upon error the
(very sloppy specification) leaves an undefined value in *ret, so it is
wrong to inspect it, the error condition is enough.
discussed a little with nicm, and then much more with millert until we
were exasperated
Diffstat (limited to 'usr.bin/file')
| -rw-r--r-- | usr.bin/file/xmalloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/file/xmalloc.c b/usr.bin/file/xmalloc.c index 5c145045476..c05b08fedbe 100644 --- a/usr.bin/file/xmalloc.c +++ b/usr.bin/file/xmalloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xmalloc.c,v 1.3 2015/11/17 18:25:03 tobias Exp $ */ +/* $OpenBSD: xmalloc.c,v 1.4 2019/06/28 05:44:09 deraadt Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -80,7 +80,7 @@ xasprintf(char **ret, const char *fmt, ...) i = vasprintf(ret, fmt, ap); va_end(ap); - if (i < 0 || *ret == NULL) + if (i == -1) err(1, "xasprintf"); return i; |