Skip to content

YAML: Improve error handling #14261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
chaoticgd wants to merge 4 commits into
base: master
Choose a base branch
from
+199 −176
Draft

YAML: Improve error handling #14261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e05dac4
YAML: Try to recover from more types of errors
chaoticgd Apr 5, 2026
c671e57
GameDB: Improve error handling in GameDatabase::parseAndInsert
chaoticgd Apr 5, 2026
c1f8e9f
GameDB: Improve error handling in parseHashDatabaseEntry
chaoticgd Apr 7, 2026
dafaecb
MemoryCardFolder: Improve YAML error handling
chaoticgd Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions common/YAML.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

#include "YAML.h"

#include "Assertions.h"

#if RYML_VERSION_MAJOR > 0 || RYML_VERSION_MINOR >= 11
#include "c4/yml/error.def.hpp" // for ryml::err_basic_format etc
#endif
Expand All @@ -28,15 +26,16 @@ std::optional<ryml::Tree> ParseYAMLFromString(ryml::csubstr yaml, ryml::csubstr
callbacks.set_user_data(static_cast<void*>(&context));

callbacks.set_error_basic([](ryml::csubstr msg, const ryml::ErrorDataBasic& errdata, void* user_data) {
RapidYAMLContext* context = static_cast<RapidYAMLContext*>(user_data);

std::string description;
auto callback = [&description](ryml::csubstr string) {
description.append(string.str, string.len);
};
ryml::err_basic_format(std::move(callback), msg, errdata);

// We might have already returned, so don't try to recover.
pxFailRel(description.c_str());
std::abort();
Error::SetString(context->error, std::move(description));
std::longjmp(context->env, 1);
});

callbacks.set_error_parse([](ryml::csubstr msg, const ryml::ErrorDataParse& errdata, void* user_data) {
Expand All @@ -53,15 +52,16 @@ std::optional<ryml::Tree> ParseYAMLFromString(ryml::csubstr yaml, ryml::csubstr
});

callbacks.set_error_visit([](ryml::csubstr msg, const ryml::ErrorDataVisit& errdata, void* user_data) {
RapidYAMLContext* context = static_cast<RapidYAMLContext*>(user_data);

std::string description;
auto callback = [&description](ryml::csubstr string) {
description.append(string.str, string.len);
};
ryml::err_visit_format(std::move(callback), msg, errdata);

// We've probably already returned, so don't try to recover.
pxFailRel(description.c_str());
std::abort();
Error::SetString(context->error, std::move(description));
std::longjmp(context->env, 1);
});
#else
callbacks.m_user_data = static_cast<void*>(&context);
Expand Down
Loading
Loading