svn commit: r312683 - head/usr.bin/mail

Xin LI delphij at FreeBSD.org
Tue Jan 24 07:48:38 UTC 2017


Author: delphij
Date: Tue Jan 24 07:48:36 2017
New Revision: 312683
URL: https://svnweb.freebsd.org/changeset/base/312683

Log:
  Don't reference NULL pointer.
  
  MFC after:	2 weeks

Modified:
  head/usr.bin/mail/popen.c

Modified: head/usr.bin/mail/popen.c
==============================================================================
--- head/usr.bin/mail/popen.c	Tue Jan 24 05:06:52 2017	(r312682)
+++ head/usr.bin/mail/popen.c	Tue Jan 24 07:48:36 2017	(r312683)
@@ -303,7 +303,7 @@ findchild(pid_t pid, int dont_alloc)
 	    cpp = &(*cpp)->link)
 			;
 	if (*cpp == NULL) {
-	if (dont_alloc)
+		if (dont_alloc)
 			return(NULL);
 		if (child_freelist) {
 			*cpp = child_freelist;
@@ -344,6 +344,8 @@ sigchild(int signo __unused)
 	save_errno = errno;
 	while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
 		cp = findchild(pid, 1);
+		if (cp == NULL)
+			continue;
 		if (cp->free)
 			delchild(cp);
 		else {


More information about the svn-src-head mailing list