From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 13 Nov 2020 16:52:20 +0000 (+0000)
Subject: [Minor] Improve the default sort function in deep_sort function
X-Git-Tag: 2.7~152
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df5db936734ef1100bf31f0cb4fa0d2d1b4c70ed;p=thirdparty%2Frspamd.git

[Minor] Improve the default sort function in deep_sort function
---

diff --git a/lualib/lua_util.lua b/lualib/lua_util.lua
index c4448117cc..dadf3f3ded 100644
--- a/lualib/lua_util.lua
+++ b/lualib/lua_util.lua
@@ -1012,10 +1012,18 @@ exports.deepcopy = deepcopy
 -- }
 -- Performs recursive in-place sort of a table
 --]]
+local function default_sort_cmp(e1, e2)
+  if type(e1) == type(e2) then
+    return e1 < e2
+  else
+    return type(e1) < type(e2)
+  end
+end
+
 local function deepsort(tbl, sort_func)
   local orig_type = type(tbl)
   if orig_type == 'table' then
-    table.sort(tbl, sort_func)
+    table.sort(tbl, sort_func or default_sort_cmp)
     for _, orig_value in next, tbl, nil do
       deepsort(orig_value)
     end