aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2018-04-24 14:53:59 +0100
committerVsevolod Stakhov <vsevolod@highsecure.ru>2018-04-24 14:54:37 +0100
commit3281d1d77a53a6d905ef1aee0e0baf1096643283 (patch)
treef3864b2986f92fb61c923d6f358fcdcea8905b73 /src
parentd173e8d13ed53e9562f472c4f670797e9cfc78b9 (diff)
downloadrspamd-3281d1d77a53a6d905ef1aee0e0baf1096643283.tar.gz
rspamd-3281d1d77a53a6d905ef1aee0e0baf1096643283.zip
[Fix] Strip spaces from map keys and values
Diffstat (limited to 'src')
-rw-r--r--src/libutil/map_helpers.c4
-rw-r--r--src/libutil/radix.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/libutil/map_helpers.c b/src/libutil/map_helpers.c
index 2cc2a1efa..dbbe70e84 100644
--- a/src/libutil/map_helpers.c
+++ b/src/libutil/map_helpers.c
@@ -76,14 +76,14 @@ struct rspamd_regexp_map_helper {
while (g_ascii_isspace (*c) && p > c) { c ++; } \
key = g_malloc (p - c + 1); \
rspamd_strlcpy (key, c, p - c + 1); \
- key = g_strchomp (key); \
+ key = g_strstrip (key); \
} while (0)
#define MAP_STORE_VALUE do { \
while (g_ascii_isspace (*c) && p > c) { c ++; } \
value = g_malloc (p - c + 1); \
rspamd_strlcpy (value, c, p - c + 1); \
- value = g_strchomp (value); \
+ value = g_strstrip (value); \
} while (0)
gchar *
diff --git a/src/libutil/radix.c b/src/libutil/radix.c
index 3ef471174..a42be7032 100644
--- a/src/libutil/radix.c
+++ b/src/libutil/radix.c
@@ -197,8 +197,9 @@ rspamd_radix_add_iplist (const gchar *list, const gchar *separators,
cur++;
continue;
}
+
/* Extract ipnet */
- ipnet = *cur;
+ ipnet = g_strstrip (*cur);
token = strsep (&ipnet, "/");
if (ipnet != NULL) {