- Fix possible infinite loop in build_thread_data()

1 files 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);
+            }
         }
     }