cvs: php4(PHP_4_3) /ext/ftp ftp.c
| From: | Moriyoshi Koizumi | Date: | Mon, 19 May 2003 13:27:05 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/ftp ftp.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-21076@lists.php.net to get a copy of this message | ||
moriyoshi Mon May 19 09:27:05 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/ftp ftp.c
Log:
MFH(r-1.86): fixed bug #23683
Index: php4/ext/ftp/ftp.c
diff -u php4/ext/ftp/ftp.c:1.68.2.6 php4/ext/ftp/ftp.c:1.68.2.7
--- php4/ext/ftp/ftp.c:1.68.2.6 Tue Mar 18 12:31:55 2003
+++ php4/ext/ftp/ftp.c Mon May 19 09:27:05 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ftp.c,v 1.68.2.6 2003/03/18 17:31:55 sniper Exp $ */
+/* $Id: ftp.c,v 1.68.2.7 2003/05/19 13:27:05 moriyoshi Exp $ */
#include "php.h"
@@ -188,9 +188,11 @@
if (ftp->pwd) {
efree(ftp->pwd);
+ ftp->pwd = NULL;
}
if (ftp->syst) {
efree(ftp->syst);
+ ftp->syst = NULL;
}
}
/* }}} */
@@ -210,6 +212,7 @@
if (ftp->pwd) {
efree(ftp->pwd);
+ ftp->pwd = NULL;
}
return 1;
@@ -389,9 +392,7 @@
return NULL;
if ((end = strrchr(++pwd, '"')) == NULL)
return NULL;
- *end = 0;
- ftp->pwd = estrdup(pwd);
- *end = '"';
+ ftp->pwd = estrndup(pwd, end - pwd);
return ftp->pwd;
}