[Midnightbsd-cvs] src [8729] trunk/lib/libc/gen/glob.c: in globextend when the pathv vector cannot be allocated , dont free and clear the gl_pathv pointer.

[laffer1 at midnightbsd.org]

Revision: 8729
          http://svnweb.midnightbsd.org/src/?rev=8729
Author:   laffer1
Date:     2016-09-25 19:54:42 -0400 (Sun, 25 Sep 2016)
Log Message:
-----------
in globextend when the pathv vector cannot be allocated , dont free and clear the gl_pathv pointer.

Modified Paths:
--------------
    trunk/lib/libc/gen/glob.c

Modified: trunk/lib/libc/gen/glob.c
===================================================================
--- trunk/lib/libc/gen/glob.c	2016-09-25 23:53:30 UTC (rev 8728)
+++ trunk/lib/libc/gen/glob.c	2016-09-25 23:54:42 UTC (rev 8729)
@@ -715,16 +715,10 @@
 	}
 
 	newsize = sizeof(*pathv) * (2 + pglob->gl_pathc + pglob->gl_offs);
-	pathv = pglob->gl_pathv ?
-		    realloc((char *)pglob->gl_pathv, newsize) :
-		    malloc(newsize);
-	if (pathv == NULL) {
-		if (pglob->gl_pathv) {
-			free(pglob->gl_pathv);
-			pglob->gl_pathv = NULL;
-		}
+	/* realloc(NULL, newsize) is equivalent to malloc(newsize). */
+	pathv = realloc((void *)pglob->gl_pathv, newsize);
+	if (pathv == NULL)
 		return(GLOB_NOSPACE);
-	}
 
 	if (pglob->gl_pathv == NULL && pglob->gl_offs > 0) {
 		/* first time around -- clear initial gl_offs items */