Fix Bug #25294 LIST/NLST can cause segfault because ftp->data not cleaned properly

diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c
index cb0c3b47e30d2d24e959019d77bab36f64ba5649..03425a2d365fc4decf4015f2025de76a2f86eff8 100644 (file)
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@@ -486,6 +486,7 @@ ftp_chdir(ftpbuf_t *ftp, const char *dir)
 
        if (ftp->pwd) {
                efree(ftp->pwd);
+               ftp->pwd = NULL;
        }
 
        if (!ftp_putcmd(ftp, "CWD", dir)) {
@@ -509,6 +510,7 @@ ftp_cdup(ftpbuf_t *ftp)
 
        if (ftp->pwd) {
                efree(ftp->pwd);
+               ftp->pwd = NULL;
        }
 
        if (!ftp_putcmd(ftp, "CDUP", NULL)) {
@@ -1662,8 +1664,7 @@ ftp_genlist(ftpbuf_t *ftp, const char *cmd, const char *path TSRMLS_DC)
 
        return ret;
 bail:
-       if (data)
-               ftp->data = data_close(ftp, data);
+       ftp->data = data_close(ftp, data);
        fclose(tmpfp);
        if (ret)
                efree(ret);