From: Ken Raeburn <raeburn@mit.edu>
Date: Wed, 22 Apr 1998 01:30:40 +0000 (+0000)
Subject: * glob.c (ftpglob): Always allocate new storage, even if no magic glob
X-Git-Tag: krb5-1.1-beta1~743
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=278108fdc7c7b4b14f0eec6bb31ad426e292aec2;p=krb5.git

* glob.c (ftpglob): Always allocate new storage, even if no magic glob
characters were found, because the caller will always free the storage.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10539 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 9fbe76b12..f56f5985e 100644
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,9 @@
+1998-04-21  Ken Raeburn  <raeburn@cygnus.com>
+
+	* glob.c (ftpglob): Always allocate new storage, even if no magic
+	glob characters were found, because the caller will always free
+	the storage.
+
 Tue Apr  7 16:53:58 1998  Dan Winship  <danw@mit.edu>
 
 	* secure.c (secure_putbyte): Set nout = 0 *before* calling
diff --git a/src/appl/gssftp/ftp/glob.c b/src/appl/gssftp/ftp/glob.c
index 3a793d83e..f92ee5e07 100644
--- a/src/appl/gssftp/ftp/glob.c
+++ b/src/appl/gssftp/ftp/glob.c
@@ -104,8 +104,17 @@ ftpglob(v)
 	vv[1] = 0;
 	gflag = 0;
 	rscan(vv, tglob);
-	if (gflag == 0)
-		return (copyblk(vv));
+	if (gflag == 0) {
+	  /* Caller will always free the contents, so make a copy.  */
+	  size_t len = strlen (v) + 1;
+	  vv[0] = malloc (len);
+	  if (vv[0] == 0) {
+	    globerr = "Can't allocate memory";
+	    return 0;
+	  }
+	  memcpy (vv[0], v, len);
+	  return (copyblk(vv));
+	}
 
 	globerr = 0;
 	gpath = agpath; gpathp = gpath; *gpathp = 0;