Skip to content

Commit

Permalink
Merge branch 'PHP-5.5' into PHP-5.6
Browse files Browse the repository at this point in the history
  • Loading branch information
nikic committed Jul 2, 2014

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents c580d9b + 8c4156e commit 4827806
Showing 2 changed files with 6 additions and 1 deletion.
3 changes: 2 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -3,8 +3,9 @@ PHP NEWS
?? ??? 2014, PHP 5.6.0 Release Candidate 3

- Core:
. Fixed buf #67497 (eval with parse error causes segmentation fault in
. Fixed bug #67497 (eval with parse error causes segmentation fault in
generator). (Nikita)
. Fixed bug #67151 (strtr with empty array crashes). (Nikita)

- pgsql:
. Fix bug #67555 (Cannot build against libpq 7.3). (Adam)
4 changes: 4 additions & 0 deletions ext/standard/string.c
Original file line number Diff line number Diff line change
@@ -3101,6 +3101,10 @@ static void php_strtr_array(zval *return_value, char *str, int slen, HashTable *
int patterns_len;
zend_llist *allocs;

if (zend_hash_num_elements(pats) == 0) {
RETURN_STRINGL(str, slen, 1);
}

S(&text) = str;
L(&text) = slen;

0 comments on commit 4827806

Please sign in to comment.