Merge branch 'PHP-5.4' into PHP-5.5

Author: nikic

NEWS

@@ -9,8 +9,9 @@ PHP                                                                        NEWS
     match). (Bob)
   . Fixed bug #67091 (make install fails to install libphp5.so on FreeBSD 10.0).
     (Ferenc)
-  . 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)
 
 - CLI server:
   . Implemented FR #67429 (CLI server is missing some new HTTP response codes).

ext/standard/string.c

@@ -3106,6 +3106,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;