]> granicus.if.org Git - php/commitdiff
MFH(r-1.86): fixed bug #23683
authorMoriyoshi Koizumi <moriyoshi@php.net>
Mon, 19 May 2003 13:27:05 +0000 (13:27 +0000)
committerMoriyoshi Koizumi <moriyoshi@php.net>
Mon, 19 May 2003 13:27:05 +0000 (13:27 +0000)
ext/ftp/ftp.c

index 646e99901c694644007f40a9e4ba4424c638de45..34afd72e73833a48cbfbfc11d837e881fe311cf3 100644 (file)
@@ -188,9 +188,11 @@ ftp_gc(ftpbuf_t *ftp)
 
        if (ftp->pwd) {
                efree(ftp->pwd);
+               ftp->pwd = NULL;
        }
        if (ftp->syst) {
                efree(ftp->syst);
+               ftp->syst = NULL;
        }
 }
 /* }}} */
@@ -210,6 +212,7 @@ ftp_quit(ftpbuf_t *ftp)
 
        if (ftp->pwd) {
                efree(ftp->pwd);
+               ftp->pwd = NULL;
        }
 
        return 1;
@@ -389,9 +392,7 @@ ftp_pwd(ftpbuf_t *ftp)
                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;
 }