]> granicus.if.org Git - php/commitdiff
fix [l]trim() in unicode mode
authorAntony Dovgal <tony2001@php.net>
Sun, 22 Apr 2007 19:22:19 +0000 (19:22 +0000)
committerAntony Dovgal <tony2001@php.net>
Sun, 22 Apr 2007 19:22:19 +0000 (19:22 +0000)
ext/standard/string.c

index e7102d0b03af6678badacd8841a6bc9b1827ef70..7f9d15b4e588c23bc27d706bfda21073bf4aaa52 100644 (file)
@@ -718,6 +718,9 @@ static UChar *php_u_trim(UChar *c, int len, UChar *what, int what_len, zval *ret
        if ( what ) {
                what = eustrndup(what, what_len);
                php_expand_uchar_range(&what, &what_len TSRMLS_CC);
+       } else {
+               what = USTR_MAKE(" \n\r\t\v\0");
+               what_len = sizeof(" \n\r\t\v\0") - 1;
        }
 
        if ( mode & 1 ) {