From 63b9ff12d2573513c59e347d70de494d2c67a4ce Mon Sep 17 00:00:00 2001 From: alecpl Date: Thu, 12 Jan 2012 14:54:21 +0000 Subject: - Fix possible infinite loop in build_thread_data() --- program/include/rcube_imap_cache.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/program/include/rcube_imap_cache.php b/program/include/rcube_imap_cache.php index ee4e92542..acff14653 100644 --- a/program/include/rcube_imap_cache.php +++ b/program/include/rcube_imap_cache.php @@ -1108,10 +1108,12 @@ class rcube_imap_cache private function build_thread_data($data, &$depth, &$children, $level = 0) { foreach ((array)$data as $key => $val) { - $children[$key] = !empty($val); - $depth[$key] = $level; - if (!empty($val)) + $empty = empty($val) || !is_array($val); + $children[$key] = !$empty; + $depth[$key] = $level; + if (!$empty) { $this->build_thread_data($val, $depth, $children, $level + 1); + } } } -- cgit v1.2.3