From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 8 Jul 2017 08:45:57 +0000 (+0100)
Subject: [Fix] Fix some more issues with HTTP maps
X-Git-Tag: 1.6.2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=25393770a6b48d63268233dea83e8120e8365d4b;p=rspamd.git

[Fix] Fix some more issues with HTTP maps
---

diff --git a/src/libutil/map.c b/src/libutil/map.c
index fad48aeab..edd4eaa1f 100644
--- a/src/libutil/map.c
+++ b/src/libutil/map.c
@@ -512,6 +512,11 @@ http_map_finish (struct rspamd_http_connection *conn,
 		}
 
 read_data:
+		if (cbd->data_len == 0) {
+			msg_err_map ("cannot read empty map");
+			goto err;
+		}
+
 		g_assert (cbd->shmem_data != NULL);
 
 		in = rspamd_shmem_xmap (cbd->shmem_data->shm_name, PROT_READ, &dlen);
@@ -537,6 +542,7 @@ read_data:
 		cache_cbd = g_slice_alloc0 (sizeof (*cache_cbd));
 		cache_cbd->shm = cbd->shmem_data;
 		cache_cbd->map = map;
+		cache_cbd->data = cbd->data;
 		cache_cbd->last_checked = cbd->data->last_checked;
 		cache_cbd->gen = cbd->data->gen;
 		MAP_RETAIN (cache_cbd->shm, "shmem_data");