wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-24 22:11:15 +02:00
Code Activity

toJSON: re-throw serialization exception

Browse source
This commit is contained in:
Philipp Otterbein 2024-12-31 17:52:06 +01:00
parent 61c3559116
commit 4a2310a3a0
4 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libexpr/value-to-json.cc
View file

@ -108,7 +108,11 @@ json printValueAsJSON(EvalState & state, bool strict,
void printValueAsJSON(EvalState & state, bool strict,
Value & v, const PosIdx pos, std::ostream & str, NixStringContext & context, bool copyToStore)
{
str << printValueAsJSON(state, strict, v, pos, context, copyToStore);
try {
str << printValueAsJSON(state, strict, v, pos, context, copyToStore);
} catch (nlohmann::json::exception & e) {
throw JSONSerializationError("JSON serialization error: %s", e.what());
}
}
json ExternalValueBase::printValueAsJSON(EvalState & state, bool strict,

3
src/libexpr/value-to-json.hh
View file

@ -16,4 +16,7 @@ nlohmann::json printValueAsJSON(EvalState & state, bool strict,
void printValueAsJSON(EvalState & state, bool strict,
Value & v, const PosIdx pos, std::ostream & str, NixStringContext & context, bool copyToStore = true);
MakeError(JSONSerializationError, Error);
}

8
tests/functional/lang/eval-fail-toJSON-non-utf-8.err.exp Normal file
View file

@ -0,0 +1,8 @@
error:
… while calling the 'toJSON' builtin
at /pwd/lang/eval-fail-toJSON-non-utf-8.nix:1:1:
1| builtins.toJSON "_invalid UTF-8: ÿ_"
| ^
2|
error: JSON serialization error: [json.exception.type_error.316] invalid UTF-8 byte at index 16: 0xFF

1
tests/functional/lang/eval-fail-toJSON-non-utf-8.nix Normal file
View file

@ -0,0 +1 @@
builtins.toJSON "_invalid UTF-8: ÿ_"