mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-21 20:43:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up JSON parsing code. Refs #1374.

Browse Source 
Fix Engine.ReadJSONFile() which did throw a JS exception that was not
caught. Discovered by s0600204.
Expose Engine.ReadJSONFile() to the gui scripts.

This was SVN commit r15959.
This commit is contained in:
leper
2014-11-13 01:26:22 +00:00
parent e1c77bb487
commit 6e788fb15e
13 changed files with 106 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/scriptinterface/ScriptInterface.cpp
+28 -7
View File
@@ -1298,16 +1298,36 @@ bool ScriptInterface::Eval_(const wchar_t* code, JS::MutableHandleValue rval)
return ok;
}
void ScriptInterface::ParseJSON(const std::string& string_utf8, JS::MutableHandleValue out)
bool ScriptInterface::ParseJSON(const std::string& string_utf8, JS::MutableHandleValue out)
{
JSAutoRequest rq(m->m_cx);
std::wstring attrsW = wstring_from_utf8(string_utf8);
utf16string string(attrsW.begin(), attrsW.end());
if (!JS_ParseJSON(m->m_cx, reinterpret_cast<const jschar*>(string.c_str()), (u32)string.size(), out))
{
LOGERROR(L"JS_ParseJSON failed!");
return;
}
if (JS_ParseJSON(m->m_cx, reinterpret_cast<const jschar*>(string.c_str()), (u32)string.size(), out))
return true;
LOGERROR(L"JS_ParseJSON failed!");
if (!JS_IsExceptionPending(m->m_cx))
return false;
JS::RootedValue exc(m->m_cx);
if (!JS_GetPendingException(m->m_cx, exc.address()))
return false;
JS_ClearPendingException(m->m_cx);
// We expect an object of type SyntaxError
if (!exc.isObject())
return false;
JS::RootedValue rval(m->m_cx);
JS::RootedObject excObj(m->m_cx, &exc.toObject());
if (!JS_CallFunctionName(m->m_cx, excObj, "toString", 0, NULL, rval.address()))
return false;
std::wstring error;
ScriptInterface::FromJSVal(m->m_cx, rval, error);
LOGERROR(L"%ls", error.c_str());
return false;
}
void ScriptInterface::ReadJSONFile(const VfsPath& path, JS::MutableHandleValue out)
@@ -1330,7 +1350,8 @@ void ScriptInterface::ReadJSONFile(const VfsPath& path, JS::MutableHandleValue o
std::string content(file.DecodeUTF8()); // assume it's UTF-8
ParseJSON(content, out);
if (!ParseJSON(content, out))
LOGERROR(L"Failed to parse '%ls'", path.string().c_str());
}
struct Stringifier