diff options
| author | whitequark <whitequark@whitequark.org> | 2021-02-24 19:12:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-24 19:12:56 +0000 |
| commit | fffbf651df4e598752a0a3f52b72e5987ec8df88 (patch) | |
| tree | 0b559fe4e7a2a3ce384afa42e77005ff1d231423 /kernel | |
| parent | b05b98521c781fef0f9d900a53310cad9e1434b0 (diff) | |
| parent | 5e439b6e3fdb498c821cccfed456547e9568f47b (diff) | |
| download | yosys-fffbf651df4e598752a0a3f52b72e5987ec8df88.tar.gz yosys-fffbf651df4e598752a0a3f52b72e5987ec8df88.tar.bz2 yosys-fffbf651df4e598752a0a3f52b72e5987ec8df88.zip | |
Merge pull request #2607 from zachjs/logger-error-atexit
Fix double-free on unmatched logger error pattern
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/log.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/log.cc b/kernel/log.cc index c7ae873bc..41e91119e 100644 --- a/kernel/log.cc +++ b/kernel/log.cc @@ -345,9 +345,6 @@ static void logv_error_with_prefix(const char *prefix, log_make_debug = bak_log_make_debug; - if (log_error_atexit) - log_error_atexit(); - for (auto &item : log_expect_error) if (YS_REGEX_NS::regex_search(log_last_error, item.second.pattern)) item.second.current_count++; @@ -355,6 +352,9 @@ static void logv_error_with_prefix(const char *prefix, if (check_expected_logs) log_check_expected(); + if (log_error_atexit) + log_error_atexit(); + YS_DEBUGTRAP_IF_DEBUGGING; #ifdef EMSCRIPTEN |