From: Vsevolod Stakhov Date: Thu, 3 Oct 2013 09:43:38 +0000 (+0100) Subject: Fix chartable plugin. X-Git-Tag: 0.6.0~138 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=727326ae53e9ca72857c0dfc29753757ba72b170;p=thirdparty%2Frspamd.git Fix chartable plugin. --- diff --git a/src/plugins/chartable.c b/src/plugins/chartable.c index c1b8826e6e..35af23d525 100644 --- a/src/plugins/chartable.c +++ b/src/plugins/chartable.c @@ -86,20 +86,18 @@ chartable_module_init (struct config_file *cfg, struct module_ctx **ctx) gint chartable_module_config (struct config_file *cfg) { - gchar *value; + rspamd_cl_object_t *value; gint res = TRUE; if ((value = get_module_opt (cfg, "chartable", "symbol")) != NULL) { - chartable_module_ctx->symbol = memory_pool_strdup (chartable_module_ctx->chartable_pool, value); + chartable_module_ctx->symbol = rspamd_cl_obj_tostring (value); } else { chartable_module_ctx->symbol = DEFAULT_SYMBOL; } if ((value = get_module_opt (cfg, "chartable", "threshold")) != NULL) { - errno = 0; - chartable_module_ctx->threshold = strtod (value, NULL); - if (errno != 0) { - msg_warn ("invalid numeric value '%s': %s", value, strerror (errno)); + if (!rspamd_cl_obj_todouble_safe (value, &chartable_module_ctx->threshold)) { + msg_warn ("invalid numeric value"); chartable_module_ctx->threshold = DEFAULT_THRESHOLD; } }