[PHP-CVS] cvs: php4(PHP_4_3) /ext/ftp ftp.c

[Sara Golemon]

pollita         Thu Feb 13 17:18:20 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php4/ext/ftp       ftp.c 
  Log:
  Buf #22052 More casual efree()ing causing segfaults
  
  
Index: php4/ext/ftp/ftp.c
diff -u php4/ext/ftp/ftp.c:1.68.2.4 php4/ext/ftp/ftp.c:1.68.2.5
--- php4/ext/ftp/ftp.c:1.68.2.4 Thu Feb 13 14:51:02 2003
+++ php4/ext/ftp/ftp.c  Thu Feb 13 17:18:20 2003
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: ftp.c,v 1.68.2.4 2003/02/13 19:51:02 pollita Exp $ */
+/* $Id: ftp.c,v 1.68.2.5 2003/02/13 22:18:20 pollita Exp $ */
 
 #include "php.h"
 
@@ -1460,7 +1460,6 @@
        char            **entry;
        char            *text;
 
-
        if ((tmpfp = tmpfile()) == NULL)
                return NULL;
 
@@ -1538,9 +1537,11 @@
 
        return ret;
 bail:
-       data_close(ftp, data);
+       if (data)
+               data_close(ftp, data);
        fclose(tmpfp);
-       efree(ret);
+       if (ret)
+               efree(ret);
        return NULL;
 }
 /* }}} */



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