d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid a possible NULL pointer dereference, nuke register usage,

Browse Source 
and remove an unnecessary reset.

Obtained from: NetBSD
This commit is contained in:
steve 1997-04-28 03:16:12 +00:00
parent 1d8c8cc1cb
commit 2d8d8d0891
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/sh/options.c
View File

@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
* $Id: options.c,v 1.12 1997/02/22 13:58:40 peter Exp $
*/
#ifndef lint
@ -110,7 +110,7 @@ procargs(argc, argv)
setinputfile(commandname, 0);
}
/* POSIX 1003.2: first arg after -c cmd is $0, remainder $1... */
if (argptr && minusc)
if (argptr && minusc && *argptr)
arg0 = *argptr++;
shellparam.p = argptr;
@ -143,7 +143,7 @@ STATIC void
options(cmdline)
int cmdline;
{
register char *p;
char *p;
int val;
int c;
@ -286,7 +286,6 @@ setparam(argv)
shellparam.nparam = nparam;
shellparam.p = newparam;
shellparam.optnext = NULL;
shellparam.reset = 1;
}
@ -412,7 +411,7 @@ getopts(optstr, optvar, optfirst, optnext, optptr)
char ***optnext;
char **optptr;
{
register char *p, *q;
char *p, *q;
char c = '?';
int done = 0;
int ind = 0;
@ -517,7 +516,7 @@ int
nextopt(optstring)
char *optstring;
{
register char *p, *q;
char *p, *q;
char c;
if ((p = optptr) == NULL || *p == '\0') {