diff options
| -rw-r--r-- | ext/standard/string.c | 60 |
1 files changed, 43 insertions, 17 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index f746a242fc..a9b4cfe8d0 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -797,29 +797,55 @@ PHPAPI zend_string *php_trim(zend_string *str, char *what, size_t what_len, int char mask[256]; if (what) { - php_charmask((unsigned char*)what, what_len, mask); - - if (mode & 1) { - for (i = 0; i < len; i++) { - if (mask[(unsigned char)c[i]]) { - trimmed++; - } else { - break; + if (what_len == 1) { + if (mode & 1) { + for (i = 0; i < len; i++) { + if (c[i] == *what) { + trimmed++; + } else { + break; + } } + len -= trimmed; + c += trimmed; } - len -= trimmed; - c += trimmed; - } - if (mode & 2) { - if (len > 0) { - i = len - 1; - do { + if (mode & 2) { + if (len > 0) { + i = len - 1; + do { + if (c[i] == *what) { + len--; + } else { + break; + } + } while (i-- != 0); + } + } + } else { + php_charmask((unsigned char*)what, what_len, mask); + + if (mode & 1) { + for (i = 0; i < len; i++) { if (mask[(unsigned char)c[i]]) { - len--; + trimmed++; } else { break; } - } while (i-- != 0); + } + len -= trimmed; + c += trimmed; + } + if (mode & 2) { + if (len > 0) { + i = len - 1; + do { + if (mask[(unsigned char)c[i]]) { + len--; + } else { + break; + } + } while (i-- != 0); + } } } } else { |