summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-11-04 21:58:44 -0800
committerStanislav Malyshev <stas@php.net>2014-11-11 16:34:50 -0800
commit32fd4590a5b9572e90548ce3d251defc3f6c4421 (patch)
treeabadddc7ec9d380f5150a6d818f42cf63e35e5d4
parentcf468b0f5c0d31cf1e36291d3d5c3781149e0183 (diff)
downloadphp-git-32fd4590a5b9572e90548ce3d251defc3f6c4421.tar.gz
fix loop - size_t is unsigned so can not be negative
-rw-r--r--ext/standard/ftp_fopen_wrapper.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c
index ed93345bac..01522bc7a9 100644
--- a/ext/standard/ftp_fopen_wrapper.c
+++ b/ext/standard/ftp_fopen_wrapper.c
@@ -635,11 +635,10 @@ static size_t php_ftp_dirstream_read(php_stream *stream, char *buf, size_t count
zend_string_release(basename);
/* Trim off trailing whitespace characters */
- tmp_len--;
while (tmp_len > 0 &&
- (ent->d_name[tmp_len] == '\n' || ent->d_name[tmp_len] == '\r' ||
- ent->d_name[tmp_len] == '\t' || ent->d_name[tmp_len] == ' ')) {
- ent->d_name[tmp_len--] = '\0';
+ (ent->d_name[tmp_len - 1] == '\n' || ent->d_name[tmp_len - 1] == '\r' ||
+ ent->d_name[tmp_len - 1] == '\t' || ent->d_name[tmp_len - 1] == ' ')) {
+ ent->d_name[--tmp_len] = '\0';
}
return sizeof(php_stream_dirent);