From: Stanislav Malyshev <stas@php.net>
Date: Wed, 5 Nov 2014 05:58:44 +0000 (-0800)
Subject: fix loop - size_t is unsigned so can not be negative
X-Git-Tag: PRE_NATIVE_TLS_MERGE~130^2~20^2~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32fd4590a5b9572e90548ce3d251defc3f6c4421;p=php

fix loop - size_t is unsigned so can not be negative
---

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);