diff options
| author | Anatol Belski <ab@php.net> | 2014-10-25 00:33:58 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-25 00:33:58 +0200 |
| commit | 173659d341528c4abbabcc6a214ff516f0369717 (patch) | |
| tree | bb3d49fa495800168fafb933b581ed072a3de83d | |
| parent | c51a42076c0f92988115a25068b8ab01dfb8a6ff (diff) | |
| parent | 010f4b797922ab914c553d0d2db000058a7b303f (diff) | |
| download | php-git-173659d341528c4abbabcc6a214ff516f0369717.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
fix infinite loop
| -rw-r--r-- | ext/standard/string.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index 1d9948dcad..b60baa6b7b 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -2764,13 +2764,13 @@ PHP_FUNCTION(ucwords) PHPAPI char *php_strtr(char *str, size_t len, char *str_from, char *str_to, size_t trlen) { size_t i; - unsigned char xlat[256], j; + unsigned char xlat[256], j = 0; if ((trlen < 1) || (len < 1)) { return str; } - for (j = 0; j < 256; xlat[j] = j, j++); + do { xlat[j] = j; } while (++j != 0); for (i = 0; i < trlen; i++) { xlat[(size_t) str_from[i]] = str_to[i]; |