]> granicus.if.org Git - php/commitdiff
Fixed bug #23683
authorMoriyoshi Koizumi <moriyoshi@php.net>
Mon, 19 May 2003 13:26:28 +0000 (13:26 +0000)
committerMoriyoshi Koizumi <moriyoshi@php.net>
Mon, 19 May 2003 13:26:28 +0000 (13:26 +0000)
ext/ftp/ftp.c

index fa184aa4a3fdebae11b3cc39b326ab82d98c0100..a7e76de84c574669ed01ba6c68aa9f39b781f2b8 100644 (file)
@@ -202,9 +202,11 @@ ftp_gc(ftpbuf_t *ftp)
        }
        if (ftp->pwd) {
                efree(ftp->pwd);
+               ftp->pwd = NULL;
        }
        if (ftp->syst) {
                efree(ftp->syst);
+               ftp->syst = NULL;
        }
 }
 /* }}} */
@@ -227,6 +229,7 @@ ftp_quit(ftpbuf_t *ftp)
 
        if (ftp->pwd) {
                efree(ftp->pwd);
+               ftp->pwd = NULL;
        }
 
        return 1;
@@ -426,9 +429,7 @@ ftp_pwd(ftpbuf_t *ftp)
        if ((end = strrchr(++pwd, '"')) == NULL) { 
                return NULL;
        }
-       *end = 0;
-       ftp->pwd = estrdup(pwd);
-       *end = '"';
+       ftp->pwd = estrndup(pwd, end - pwd);
 
        return ftp->pwd;
 }