From: bitblt <bitblt@openbsd.org>
Date: Sat, 7 Dec 1996 10:52:06 +0000 (+0000)
Subject: Checks to see that strdup() worked, dies with error message on failure.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ae4e5bf96e60aef53fab636f42136bb4156c2611;p=openbsd

Checks to see that strdup() worked, dies with error message on failure.
---

diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c
index 0bd62a96d7b..1d67f02d9f4 100644
--- a/libexec/ftpd/popen.c
+++ b/libexec/ftpd/popen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: popen.c,v 1.7 1996/10/25 23:59:18 imp Exp $	*/
+/*	$OpenBSD: popen.c,v 1.8 1996/12/07 10:52:06 bitblt Exp $	*/
 /*	$NetBSD: popen.c,v 1.5 1995/04/11 02:45:00 cgd Exp $	*/
 
 /*
@@ -107,11 +107,18 @@ ftpd_popen(program, type)
 
 		memset(&gl, 0, sizeof(gl));
 		if (glob(argv[argc], flags, NULL, &gl)) {
-			if (gargc < MAX_GARGV-1)
+			if (gargc < MAX_GARGV-1) {
 				gargv[gargc++] = strdup(argv[argc]);
+				if (gargv[gargc -1] == NULL)
+					fatal ("Out of memory");
+			}
+
 		} else
-			for (pop = gl.gl_pathv; *pop && gargc < MAX_GARGV-1; pop++)
+			for (pop = gl.gl_pathv; *pop && gargc < MAX_GARGV-1; pop++) {
 				gargv[gargc++] = strdup(*pop);
+				if (gargv[gargc - 1] == NULL)
+					fatal ("Out of memory");
+			}
 		globfree(&gl);
 	}
 	gargv[gargc] = NULL;