diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2014-12-23 23:19:21 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2014-12-23 23:19:21 +0000 |
| commit | af9034a8036f884fc06874c445d85ac9f416f4fe (patch) | |
| tree | 01ceaeec83dcf7e2bab07cbf2db7f40b7fcb5622 /usr/src/cmd/mailx/fio.c | |
| parent | 8af96fbb6bb47d4566bcfef02a8e551164eb2208 (diff) | |
| parent | 5422785d352a2bb398daceab3d1898a8aa64d006 (diff) | |
| download | illumos-joyent-release-20141225.tar.gz | |
[illumos-gate merge]20141225release-20141225
commit 5422785d352a2bb398daceab3d1898a8aa64d006
5481 CVE-2012-1750 mailx(1) tilde expansion vulnerability
5482 CVE-2014-7844, CVE-2004-2771 - more mailx(1) woes
commit 196c7f05d2deba7404e90ad67f3861185c78ca2d
5480 CVE-2012-3165 mailx(1) buffer overflow vulnerability
Diffstat (limited to 'usr/src/cmd/mailx/fio.c')
| -rw-r--r-- | usr/src/cmd/mailx/fio.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/usr/src/cmd/mailx/fio.c b/usr/src/cmd/mailx/fio.c index 818860d7ae..53907ca760 100644 --- a/usr/src/cmd/mailx/fio.c +++ b/usr/src/cmd/mailx/fio.c @@ -21,6 +21,10 @@ */ /* + * Copyright 2014 Joyent, Inc. + */ + +/* * Copyright 1999 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -28,8 +32,6 @@ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "rcv.h" #include <locale.h> #include <wordexp.h> @@ -174,7 +176,7 @@ setptr(register FILE *ibuf) } /* Look for a From line that starts a new message */ - if (blankline && linebuf[0] == 'F' && ishead(linebuf)) { + if (blankline && linebuf[0] == 'F' && is_headline(linebuf)) { if (msgCount > 0 && !newmail) { message[msgCount-1].m_size = s; message[msgCount-1].m_lines = l; @@ -755,7 +757,7 @@ expand(char *name) if (debug) fprintf(stderr, "%s\n", name); return (name); } - if (wordexp(name, &wrdexp_buf, 0) != 0) { + if (wordexp(name, &wrdexp_buf, WRDE_NOCMD) != 0) { fprintf(stderr, gettext("Syntax error in \"%s\"\n"), name); fflush(stderr); return (NOSTR); |