[Minor] Allow to allocate rspamd_text from task

diff --git a/src/lua/lua_common.h b/src/lua/lua_common.h
index 2ea51249d4c5aa441040dc8bde291b6e6a3d17b9..226b250a7b3a76b0032dc1a5474321780dfa014c 100644 (file)
--- a/src/lua/lua_common.h
+++ b/src/lua/lua_common.h
@@ -255,9 +255,27 @@ struct rspamd_lua_text *lua_check_text (lua_State *L, gint pos);
 * @return
 */
 struct rspamd_lua_text *lua_check_text_or_string (lua_State *L, gint pos);
-/* Creates and *pushes* new rspamd text, data is copied if  RSPAMD_TEXT_FLAG_OWN is in flags*/
+/**
+ * Create new text object
+ * @param L
+ * @param start
+ * @param len
+ * @param own
+ * @return
+ */
 struct rspamd_lua_text *lua_new_text (lua_State *L, const gchar *start,
                                                                          gsize len, gboolean own);
+/**
+ * Create new text object from task pool if allocation is needed
+ * @param task
+ * @param L
+ * @param start
+ * @param len
+ * @param own
+ * @return
+ */
+struct rspamd_lua_text * lua_new_text_task(lua_State *L, struct rspamd_task *task,
+                                                                                  const gchar *start, gsize len, gboolean own);
 /**
  * Checks if a text has binary characters (non ascii and non-utf8 characters)
  * @param t

diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c
index f19d424fea9be3cafa55cb1b36a0f2e952fdc132..8e25c34900a328333c5e0ec0865c32c221a5df4c 100644 (file)
--- a/src/lua/lua_task.c
+++ b/src/lua/lua_task.c
@@ -2728,17 +2728,16 @@ lua_task_get_rawbody (lua_State * L)
 
        if (task) {
                if (task->message != NULL) {
-                       t = lua_newuserdata (L, sizeof (*t));
-                       rspamd_lua_setclass (L, "rspamd{text}", -1);
+
 
                        if (MESSAGE_FIELD (task, raw_headers_content).len > 0) {
                                g_assert (MESSAGE_FIELD (task, raw_headers_content).len <= task->msg.len);
-                               t->start = task->msg.begin + MESSAGE_FIELD (task, raw_headers_content).len;
-                               t->len = task->msg.len - MESSAGE_FIELD (task, raw_headers_content).len;
+                               t = lua_new_text_task (L, task, task->msg.begin + MESSAGE_FIELD (task, raw_headers_content).len,
+                                       task->msg.len - MESSAGE_FIELD (task, raw_headers_content).len, FALSE);
                        }
                        else {
-                               t->len = task->msg.len;
-                               t->start = task->msg.begin;
+                               t = lua_new_text_task (L, task, task->msg.begin,
+                                       task->msg.len, FALSE);
                        }
 
                        t->flags = 0;
@@ -2746,7 +2745,7 @@ lua_task_get_rawbody (lua_State * L)
                else {
                        /* Push body it it is there */
                        if (task->msg.len > 0 && task->msg.begin != NULL) {
-                               lua_new_text (L, task->msg.begin, task->msg.len, FALSE);
+                               lua_new_text_task (L, task->msg.begin, task->msg.len, FALSE);
                        }
                        else {
                                lua_pushnil (L);

diff --git a/src/lua/lua_text.c b/src/lua/lua_text.c
index bafab3c0836f8506f52c2bba70947a75e9994f43..f911b3e6fd4f04dbb668708462489fc1840e37d3 100644 (file)
--- a/src/lua/lua_text.c
+++ b/src/lua/lua_text.c
@@ -348,6 +348,41 @@ lua_new_text (lua_State *L, const gchar *start, gsize len, gboolean own)
        return t;
 }
 
+struct rspamd_lua_text *
+lua_new_text_task (lua_State *L, struct rspamd_task *task,
+                                  const gchar *start, gsize len, gboolean own)
+{
+       struct rspamd_lua_text *t;
+
+       t = lua_newuserdata (L, sizeof (*t));
+       t->flags = 0;
+
+       if (own) {
+               gchar *storage;
+
+               if (len > 0) {
+                       storage = rspamd_mempool_alloc (task->task_pool, len);
+
+                       if (start != NULL) {
+                               memcpy (storage, start, len);
+                       }
+
+                       t->start = storage;
+               }
+               else {
+                       t->start = "";
+               }
+       }
+       else {
+               t->start = start;
+       }
+
+       t->len = len;
+       rspamd_lua_setclass (L, "rspamd{text}", -1);
+
+       return t;
+}
+
 bool
 lua_is_text_binary(struct rspamd_lua_text *t)
 {