From 3cc6bd10acdec14dc28bce1f39689bc99add4514 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 2 Jul 2014 22:31:52 +0200 Subject: [PATCH] Fix bug #67151: strtr with empty array crashes --- NEWS | 1 + ext/standard/string.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/NEWS b/NEWS index ccc90277ba1..44196a3e1a6 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,7 @@ PHP NEWS match). (Bob) . Fixed bug #67091 (make install fails to install libphp5.so on FreeBSD 10.0). (Ferenc) + . Fixed bug #67151 (strtr with empty array crashes). (Nikita) - CLI server: . Implemented FR #67429 (CLI server is missing some new HTTP response codes). diff --git a/ext/standard/string.c b/ext/standard/string.c index c4e77f2f299..22b1957f1e0 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -3155,6 +3155,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;