cvs: php-src /ext/standard ftp_fopen_wrapper.c

tony2001 Fri Sep 21 12:57:23 2007 UTC Modified files: /php-src/ext/standard ftp_fopen_wrapper.c Log: 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.96&r2=1.97&diff_format=u Index: php-src/ext/standard/ftp_fopen_wrapper.c diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.96 php-src/ext/standard/ftp_fopen_wrapper.c:1.97 --- php-src/ext/standard/ftp_fopen_wrapper.c:1.96 Fri Aug 31 07:41:45 2007 +++ php-src/ext/standard/ftp_fopen_wrapper.c Fri Sep 21 12:57:23 2007 @@ -18,7 +18,7 @@ | Sara Golemon <pollita@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: ftp_fopen_wrapper.c,v 1.96 2007/08/31 07:41:45 jani Exp $ */ +/* $Id: ftp_fopen_wrapper.c,v 1.97 2007/09/21 12:57:23 tony2001 Exp $ */ #include "php.h" #include "php_globals.h" @@ -666,6 +666,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; @@ -731,8 +733,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; } /* }}} */