diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-08-03 23:00:32 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-08-03 23:00:32 -0700 |
| commit | b57474f23efd419a739408ab7a05e49e831e37ad (patch) | |
| tree | 963599122933b11fd13dfcdb36fff3485e28cc6c | |
| parent | db4211a8fee3079d5b53c6673c75afe41eb6a8f6 (diff) | |
| parent | 4f861b60710639557635e9f3cf13bf9cbf8872cd (diff) | |
| download | php-git-b57474f23efd419a739408ab7a05e49e831e37ad.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #72716 - initialize buffer before read
Conflicts:
ext/standard/ftp_fopen_wrapper.c
| -rw-r--r-- | ext/standard/ftp_fopen_wrapper.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c index 10dcdb8006..82875777a0 100644 --- a/ext/standard/ftp_fopen_wrapper.c +++ b/ext/standard/ftp_fopen_wrapper.c @@ -82,6 +82,7 @@ typedef struct _php_ftp_dirstream_data { */ static inline int get_ftp_result(php_stream *stream, char *buffer, size_t buffer_size) { + buffer[0] = '\0'; /* in case read fails to read anything */ while (php_stream_gets(stream, buffer, buffer_size-1) && !(isdigit((int) buffer[0]) && isdigit((int) buffer[1]) && isdigit((int) buffer[2]) && buffer[3] == ' ')); @@ -707,7 +708,7 @@ php_stream * php_stream_ftp_opendir(php_stream_wrapper *wrapper, const char *pat if (result > 299 || result < 200) goto opendir_errexit; - // tmp_line isn't relevant after the php_fopen_do_pasv(). + // tmp_line isn't relevant after the php_fopen_do_pasv(). tmp_line[0] = '\0'; /* set up the passive connection */ @@ -735,7 +736,7 @@ php_stream * php_stream_ftp_opendir(php_stream_wrapper *wrapper, const char *pat php_stream_wrapper_log_error(wrapper, options, "Unable to activate SSL mode"); php_stream_close(datastream); datastream = NULL; - goto opendir_errexit; + goto opendir_errexit; } |