Merge pull request #2607 from zachjs/logger-error-atexit

Fix double-free on unmatched logger error pattern
This commit is contained in:
whitequark 2021-02-24 19:12:56 +00:00 committed by GitHub
commit fffbf651df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions

View File

@ -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