lib-storage: mail_search_args_simplify() - Add data stack frame

diff --git a/src/lib-storage/mail-search-args-simplify.c b/src/lib-storage/mail-search-args-simplify.c
index 2a1cace6d6912e0c2cce8112663e619ea4834b5a..0ef1306ff455a72199841962fcf1fce84f98a7d5 100644 (file)
--- a/src/lib-storage/mail-search-args-simplify.c
+++ b/src/lib-storage/mail-search-args-simplify.c
@@ -398,13 +398,10 @@ mail_search_args_have_all_equal(struct mail_search_arg *parent_arg,
                   = A + B
 */
 static bool
-mail_search_args_simplify_drop_redundant_args(struct mail_search_args *all_args,
-                                             struct mail_search_arg **argsp,
-                                             bool and_arg)
+mail_search_args_simplify_drop_redundant_args_real(struct mail_search_args *all_args,
+                                                  struct mail_search_arg **argsp,
+                                                  bool and_arg)
 {
-       if (*argsp == NULL || (*argsp)->next == NULL)
-               return FALSE;
-
        struct mail_search_arg *arg, **argp;
        enum mail_search_arg_type child_subargs_type;
        bool changed = FALSE;
@@ -452,6 +449,22 @@ mail_search_args_simplify_drop_redundant_args(struct mail_search_args *all_args,
        return changed;
 }
 
+static bool
+mail_search_args_simplify_drop_redundant_args(struct mail_search_args *all_args,
+                                             struct mail_search_arg **argsp,
+                                             bool and_arg)
+{
+       if (*argsp == NULL || (*argsp)->next == NULL)
+               return FALSE;
+
+       bool ret;
+       T_BEGIN {
+               ret = mail_search_args_simplify_drop_redundant_args_real(
+                       all_args, argsp, and_arg);
+       } T_END;
+       return ret;
+}
+
 static bool
 mail_search_args_simplify_extract_common(struct mail_search_args *all_args,
                                         struct mail_search_arg **argsp,