diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-01-10 12:36:12 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-01-10 12:36:12 +0000 |
| commit | fe3edc0dfa04158efee4fa935ab2640095265063 (patch) | |
| tree | 14f0fe99c718a321e71724030a53e289eec790a2 /src/controller.c | |
| parent | cb846eabcdd306de3ff54c77ad0184f08850dead (diff) | |
| download | rspamd-fe3edc0dfa04158efee4fa935ab2640095265063.tar.gz rspamd-fe3edc0dfa04158efee4fa935ab2640095265063.zip | |
[Fix] Fix usage of unsafe ucl iterators
Diffstat (limited to 'src/controller.c')
| -rw-r--r-- | src/controller.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/controller.c b/src/controller.c index 9733368a2..8949da733 100644 --- a/src/controller.c +++ b/src/controller.c @@ -2001,8 +2001,10 @@ rspamd_controller_handle_saveactions ( return 0; } + it = ucl_object_iterate_new (obj); + for (i = 0; i < 3; i++) { - cur = ucl_object_iterate (obj, &it, TRUE); + cur = ucl_object_iterate_safe (it, TRUE); if (cur == NULL) { break; } @@ -2029,6 +2031,8 @@ rspamd_controller_handle_saveactions ( } } + ucl_object_iterate_free (it); + if (dump_dynamic_config (ctx->cfg)) { msg_info_session ("<%s> modified %d actions", rspamd_inet_address_to_string (session->from_addr), @@ -2111,11 +2115,15 @@ rspamd_controller_handle_savesymbols ( return 0; } - while ((cur = ucl_object_iterate (obj, &iter, true))) { + iter = ucl_object_iterate_new (obj); + + while ((cur = ucl_object_iterate_safe (iter, true))) { if (cur->type != UCL_OBJECT) { msg_err_session ("json array data error"); rspamd_controller_send_error (conn_ent, 400, "Cannot parse input"); ucl_object_unref (obj); + ucl_object_iterate_free (iter); + return 0; } @@ -2132,6 +2140,8 @@ rspamd_controller_handle_savesymbols ( rspamd_controller_send_error (conn_ent, 506, "Add symbol failed"); ucl_object_unref (obj); + ucl_object_iterate_free (iter); + return 0; } added ++; @@ -2144,6 +2154,8 @@ rspamd_controller_handle_savesymbols ( } } + ucl_object_iterate_free (iter); + if (added > 0) { if (ctx->cfg->dynamic_conf) { if (dump_dynamic_config (ctx->cfg)) { |