com php-src: fix loop - size_t is unsigned so can n ot be negative: ext/standard/ftp_fopen_wrapper.c
| From: | Stanislav Malyshev | Date: | Wed, 12 Nov 2014 00:33:02 +0000 |
| Subject: | com php-src: fix loop - size_t is unsigned so can n ot be negative: ext/standard/ftp_fopen_wrapper.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83033@lists.php.net to get a copy of this message | ||
Commit: 1b143f4033d65141cdfc0615bd7e95d4b88b3f6f
Author: Stanislav Malyshev <stas@php.net> Tue, 4 Nov 2014 21:58:44 -0800
Parents: 4571cc2195dfba340c39952fa3cbb545c5d41f0e
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1b143f4033d65141cdfc0615bd7e95d4b88b3f6f
Log:
fix loop - size_t is unsigned so can not be negative
Changed paths:
M ext/standard/ftp_fopen_wrapper.c
Diff:
diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c
index d6eb3b8..ab75da7 100644
--- a/ext/standard/ftp_fopen_wrapper.c
+++ b/ext/standard/ftp_fopen_wrapper.c
@@ -644,11 +644,10 @@ static size_t php_ftp_dirstream_read(php_stream *stream, char *buf, size_t
count
efree(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';
+ while (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);