Commit: 930ef9ddd663dcda5726b5d33c54c49a2f4f97d6 Author: Gustavo Lopes <gust...@icemobile.com> Tue, 15 Jan 2013 17:25:59 +0100 Parents: d7bac4f5ba17c6fba00943a8bada49a4735a15a6 Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=930ef9ddd663dcda5726b5d33c54c49a2f4f97d6 Log: Fixed inconsequential bug in strtr() Changed paths: M ext/standard/string.c Diff: diff --git a/ext/standard/string.c b/ext/standard/string.c index 953dfd1..58b5483 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -3021,7 +3021,7 @@ static PPRES *php_strtr_array_prepare(STR *text, PATNREPL *patterns, int patnum, res->shift->table_mask = SHIFT_TAB_SIZE - 1; php_strtr_populate_shift(patterns, patnum, B, res->m, res->shift); - res->hash = safe_emalloc(HASH_TAB_SIZE, sizeof(*res->hash->entries), sizeof(*res->shift)); + res->hash = safe_emalloc(HASH_TAB_SIZE, sizeof(*res->hash->entries), sizeof(*res->hash)); res->hash->table_mask = HASH_TAB_SIZE - 1; res->patterns = safe_emalloc(patnum, sizeof(*res->patterns), 0); @@ -3051,7 +3051,7 @@ static PPRES *php_strtr_array_prepare(STR *text, PATNREPL *patterns, int patnum, } } } - res->hash->entries[HASH_TAB_SIZE] = patnum; + res->hash->entries[HASH_TAB_SIZE] = patnum; /* OK, we effectively allocated SIZE+1 */ for (i = HASH_TAB_SIZE - 1; i >= 0; i--) { if (res->hash->entries[i] == -1) { res->hash->entries[i] = res->hash->entries[i + 1]; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
