Fixed inconsequential bug in strtr()

cataphract · cataphract · commit 930ef9ddd663 · 2013-01-15T17:25:59.000+01:00
diff --git 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];

Original file line number	Diff line number	Diff line change
`@@ -3021,7 +3021,7 @@ static PPRES php_strtr_array_prepare(STR text, PATNREPL *patterns, int patnum,`
`3021`	`3021`	`res->shift->table_mask = SHIFT_TAB_SIZE - 1;`
`3022`	`3022`	`php_strtr_populate_shift(patterns, patnum, B, res->m, res->shift);`
`3023`	`3023`
`3024`		`- res->hash = safe_emalloc(HASH_TAB_SIZE, sizeof(res->hash->entries), sizeof(res->shift));`
	`3024`	`+ res->hash = safe_emalloc(HASH_TAB_SIZE, sizeof(res->hash->entries), sizeof(res->hash));`
`3025`	`3025`	`res->hash->table_mask = HASH_TAB_SIZE - 1;`
`3026`	`3026`
`3027`	`3027`	`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,`
`3051`	`3051`	`}`
`3052`	`3052`	`}`
`3053`	`3053`	`}`
`3054`		`- res->hash->entries[HASH_TAB_SIZE] = patnum;`
	`3054`	`+ res->hash->entries[HASH_TAB_SIZE] = patnum; /* OK, we effectively allocated SIZE+1 */`
`3055`	`3055`	`for (i = HASH_TAB_SIZE - 1; i >= 0; i--) {`
`3056`	`3056`	`if (res->hash->entries[i] == -1) {`
`3057`	`3057`	`res->hash->entries[i] = res->hash->entries[i + 1];`