[Fix] Strip spaces from map keys and values

diff --git a/src/libutil/map_helpers.c b/src/libutil/map_helpers.c
index 2cc2a1efa2b228d5a0e4998d5b13e8dc0758d519..dbbe70e84a70482e250f82118e893d48c1036ea8 100644 (file)
--- 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 3ef47117466eb3cd63aa3b5a725365ebe9ee9120..a42be7032b942b42a1dbad37729f98f6b318807f 100644 (file)
--- 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) {