GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-08-15 06:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Wrap picojson::parse with exception clause to catch JSON parsing error.

Browse Source
This commit is contained in:
Syoyo Fujita 2017-08-01 20:12:08 +09:00
parent 2b0307f397
commit cdf849061c
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tiny_gltf.h
View File

@ -2278,7 +2278,6 @@ static bool ParseCamera(Camera *camera, std::string *err,
bool TinyGLTF::LoadFromString(Model *model, std::string *err, const char *str, bool TinyGLTF::LoadFromString(Model *model, std::string *err, const char *str,
unsigned int length, const std::string &base_dir, unsigned int length, const std::string &base_dir,
unsigned int check_sections) { unsigned int check_sections) {
if (length < 4) { if (length < 4) {
if (err) { if (err) {
(*err) = "JSON string too short.\n"; (*err) = "JSON string too short.\n";
@ -2286,12 +2285,20 @@ bool TinyGLTF::LoadFromString(Model *model, std::string *err, const char *str,
return false; return false;
} }
// TODO(syoyo): Add feature not using exception handling.
picojson::value v; picojson::value v;
std::string perr = picojson::parse(v, str, str + length); try {
std::string perr = picojson::parse(v, str, str + length);
if (!perr.empty()) { if (!perr.empty()) {
if (err) {
(*err) = "JSON parsing error: " + perr;
}
return false;
}
} catch (std::exception e) {
if (err) { if (err) {
(*err) = "JSON parsing error: " + perr; (*err) = e.what();
} }
return false; return false;
} }
@ -2304,7 +2311,6 @@ bool TinyGLTF::LoadFromString(Model *model, std::string *err, const char *str,
return false; return false;
} }
// scene is not mandatory. // scene is not mandatory.
// FIXME Maybe a better way to handle it than removing the code // FIXME Maybe a better way to handle it than removing the code