From: Rasmus Lerdorf <rasmus@php.net>
Date: Wed, 7 Jun 2000 00:59:14 +0000 (+0000)
Subject: Make trim strip \0 to match php 3
X-Git-Tag: PRE_EIGHT_BYTE_ALLOC_PATCH~57
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff843bacf445c185be292a32c8078a72a6e11c53;p=php

Make trim strip \0 to match php 3
@ Make trim strip \0 to match php 3 (Rasmus)
---

diff --git a/ext/standard/string.c b/ext/standard/string.c
index cd68ac1116..9b49744065 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -133,7 +133,7 @@ PHPAPI void php_trim(zval *str, zval * return_value, int mode)
 	if (mode & 1) {
 		for (i = 0; i < len; i++) {
 			if (c[i] == ' ' || c[i] == '\n' || c[i] == '\r' ||
-				c[i] == '\t' || c[i] == '\v') {
+				c[i] == '\t' || c[i] == '\v' || c[i] == '\0') {
 				trimmed++;
 			} else {
 				break;
@@ -145,7 +145,7 @@ PHPAPI void php_trim(zval *str, zval * return_value, int mode)
 	if (mode & 2) {
 		for (i = len - 1; i >= 0; i--) {
 			if (c[i] == ' ' || c[i] == '\n' || c[i] == '\r' ||
-				c[i] == '\t' || c[i] == '\v') {
+				c[i] == '\t' || c[i] == '\v' || c[i] == '\0') {
 				len--;
 			} else {
 				break;