From 4ec6115ee124f108246c3eea9a9dd933865dc18d Mon Sep 17 00:00:00 2001 From: Maksym Sobolyev Date: Sat, 14 Nov 2026 22:29:13 -0700 Subject: [PATCH] Fix memory leaks on parser error paths - ucl_state_machine(): the object returned by ucl_parse_macro_arguments() was leaked when skipping comments after the arguments failed (e.g. unterminated comment) or when ucl_parse_macro_value() failed. - ucl_parser_free(): lower-priority duplicate objects parked in trash_objs can still acquire nested containers while parsing continues (e.g. ".priority 6\n\x92 a\n.priority 2\n\x92 a {"); they were freed with the shallow ucl_object_dtor_free, leaking the nested containers. Use ucl_object_dtor_unref so children are released too. Found by rtpproxy's fuzz_config_file fuzzer (LeakSanitizer). --- src/ucl_parser.c | 17 ++++++++++++++++- src/ucl_util.c | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/ucl_parser.c b/src/ucl_parser.c index 8e851ea..90e50f1 100644 --- a/src/ucl_parser.c +++ b/src/ucl_parser.c @@ -2705,7 +2705,19 @@ ucl_state_machine(struct ucl_parser *parser) macro_args = ucl_parse_macro_arguments(parser, chunk); p = chunk->pos; if (macro_args) { - SKIP_SPACES_COMMENTS(parser, chunk, p); + while (p < chunk->end) { + if (!ucl_test_character(*p, UCL_CHARACTER_WHITESPACE_UNSAFE)) { + if (chunk->remain >= 2 && ucl_lex_is_comment(p[0], p[1])) { + if (!ucl_skip_comments(parser)) { + ucl_object_unref(macro_args); + return false; + } + p = chunk->pos; + } + break; + } + ucl_chunk_skipc(chunk, p); + } } } else { @@ -2713,6 +2725,9 @@ ucl_state_machine(struct ucl_parser *parser) } if (!ucl_parse_macro_value(parser, chunk, macro, ¯o_start, ¯o_len)) { + if (macro_args) { + ucl_object_unref(macro_args); + } parser->prev_state = parser->state; parser->state = UCL_STATE_ERROR; return false; diff --git a/src/ucl_util.c b/src/ucl_util.c index b25f715..5ac913e 100644 --- a/src/ucl_util.c +++ b/src/ucl_util.c @@ -643,7 +643,7 @@ void ucl_parser_free(struct ucl_parser *parser) } LL_FOREACH_SAFE(parser->trash_objs, tr, trtmp) { - ucl_object_free_internal(tr, false, ucl_object_dtor_free); + ucl_object_free_internal(tr, false, ucl_object_dtor_unref); } if (parser->err != NULL && parser->err != parser->_err_buf) {