--- ray/src/common/wordfile.c	1992/11/03 19:34:00	2.4
+++ ray/src/common/wordfile.c	1993/06/18 09:00:22	2.7
@@ -27,6 +27,8 @@ char	*fname;
 	char	buf[MAXFLEN];
 	register int	n;
 					/* load file into buffer */
+	if (fname == NULL)
+		return(-1);			/* no filename */
 	if ((fd = open(fname, 0)) < 0)
 		return(-1);			/* open error */
 	n = read(fd, buf, MAXFLEN);
@@ -62,7 +64,7 @@ char	*str;
 		if (!*cp)		/* all done? */
 			break;
 		*ap++ = cp;		/* add argument to list */
-		while (*cp && !isspace(*cp++))
+		while (*++cp && !isspace(*cp))
 			;
 	}
 	*ap = NULL;