]> granicus.if.org Git - php/commitdiff
Make trim strip \0 to match php 3
authorRasmus Lerdorf <rasmus@php.net>
Wed, 7 Jun 2000 00:59:14 +0000 (00:59 +0000)
committerRasmus Lerdorf <rasmus@php.net>
Wed, 7 Jun 2000 00:59:14 +0000 (00:59 +0000)
@ Make trim strip \0 to match php 3 (Rasmus)

ext/standard/string.c

index cd68ac111650bf260bdb2154e2dfba8e566ac4d8..9b49744065b9b6756a60c015bcb8f9a81994166a 100644 (file)
@@ -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;