From: Sara Golemon <pollita@php.net>
Date: Fri, 14 Jul 2006 19:15:31 +0000 (+0000)
Subject: #38105 (2/3) Filters should report char/UChar count, not bytes
X-Git-Tag: RELEASE_1_0_0RC1~2419
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb634dfa846d33c5ff185f543cf2bcc52ff4c8b1;p=php

#38105 (2/3) Filters should report char/UChar count, not bytes
---

diff --git a/main/streams/unicode_filter.c b/main/streams/unicode_filter.c
index d54d8402e2..1f39f8b86a 100644
--- a/main/streams/unicode_filter.c
+++ b/main/streams/unicode_filter.c
@@ -79,7 +79,7 @@ static php_stream_filter_status_t php_unicode_to_string_filter(
 			php_stream_bucket_append(buckets_out, new_bucket TSRMLS_CC);
 			exit_status = PSFS_PASS_ON;
 		}
-		consumed += UBYTES(bucket->buflen);
+		consumed += bucket->buflen;
 		php_stream_bucket_delref(bucket TSRMLS_CC);
 	}
 
@@ -131,7 +131,7 @@ static php_stream_filter_status_t php_unicode_from_string_filter(
 		php_stream_bucket_unlink(bucket TSRMLS_CC);
 		if (bucket->buf_type == IS_UNICODE) {
 			/* already in unicode, nothing to do */
-			consumed += UBYTES(bucket->buflen);
+			consumed += bucket->buflen;
 			php_stream_bucket_append(buckets_out, bucket TSRMLS_CC);
 			exit_status = PSFS_PASS_ON;
 			continue;