nlopess         Wed Jan  3 20:04:57 2007 UTC

  Modified files:              (Branch: PHP_4_4)
    /php-src/ext/ftp    ftp.c 
  Log:
  merge Tony's patch to fix memleak
  
http://cvs.php.net/viewvc.cgi/php-src/ext/ftp/ftp.c?r1=1.68.2.22.2.4&r2=1.68.2.22.2.5&diff_format=u
Index: php-src/ext/ftp/ftp.c
diff -u php-src/ext/ftp/ftp.c:1.68.2.22.2.4 php-src/ext/ftp/ftp.c:1.68.2.22.2.5
--- php-src/ext/ftp/ftp.c:1.68.2.22.2.4 Mon Jan  1 09:46:42 2007
+++ php-src/ext/ftp/ftp.c       Wed Jan  3 20:04:57 2007
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: ftp.c,v 1.68.2.22.2.4 2007/01/01 09:46:42 sebastian Exp $ */
+/* $Id: ftp.c,v 1.68.2.22.2.5 2007/01/03 20:04:57 nlopess Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1503,6 +1503,8 @@
 
        /* some servers don't open a ftp-data connection if the directory is 
empty */
        if (ftp->resp == 226) {
+               ftp->data = data_close(ftp, data);
+               php_stream_close(tmpstream);
                return ecalloc(1, sizeof(char**));
        }
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to