- Fix possible infinite loop in buildThreadData()

1 files changed, 5 insertions, 3 deletions

diff --git a/program/include/rcube_result_thread.php b/program/include/rcube_result_thread.php
index 63d54a109..0cfd383eb 100644
--- a/program/include/rcube_result_thread.php
+++ b/program/include/rcube_result_thread.php
@@ -553,10 +553,12 @@ class rcube_result_thread
     private function buildThreadData($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->buildThreadData($val, $depth, $children, $level + 1);
+            }
         }
     }