[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard ftp_fopen_wrapper.c

[Antony Dovgal]

tony2001                Fri Sep 21 12:57:38 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/standard       ftp_fopen_wrapper.c 
  Log:
  MFH: fix invalid read when opendir over FTP fails (coverity issue #462)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.85.2.4.2.3&r2=1.85.2.4.2.4&diff_format=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.3 
php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.4
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.85.2.4.2.3       Fri Aug 31 
07:42:00 2007
+++ php-src/ext/standard/ftp_fopen_wrapper.c    Fri Sep 21 12:57:38 2007
@@ -18,7 +18,7 @@
    |          Sara Golemon <[EMAIL PROTECTED]>                              |
    +----------------------------------------------------------------------+
  */
-/* $Id: ftp_fopen_wrapper.c,v 1.85.2.4.2.3 2007/08/31 07:42:00 jani Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.85.2.4.2.4 2007/09/21 12:57:38 tony2001 Exp $ 
*/
 
 #include "php.h"
 #include "php_globals.h"
@@ -669,6 +669,8 @@
        char ip[sizeof("123.123.123.123")];
        unsigned short portno;
 
+       tmp_line[0] = '\0';
+
        stream = php_ftp_fopen_connect(wrapper, path, mode, options, 
opened_path, context, &reuseid, &resource, &use_ssl, &use_ssl_on_data 
TSRMLS_CC);
        if (!stream) {
                goto opendir_errexit;   
@@ -734,8 +736,9 @@
                php_stream_notify_error(context, PHP_STREAM_NOTIFY_FAILURE, 
tmp_line, result);
                php_stream_close(stream);
        }
-       if (tmp_line[0] != '\0')
+       if (tmp_line[0] != '\0') {
                php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "FTP 
server reports %s", tmp_line);
+       }
        return NULL;
 }
 /* }}} */

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