mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-10-13 16:39:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Exact stack rooting for JSON related ScriptInterface functions.

Browse Source 
Refs #2415
Refs #2462

This was SVN commit r15603.
This commit is contained in:
Yves
2014-08-02 22:21:50 +00:00
parent 15fa9e2c2e
commit a2bd44b23a
25 changed files with 151 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation2/Simulation2.cpp
+12 -3
View File
@@ -724,7 +724,12 @@ CScriptValRooted CSimulation2::GetInitAttributes()
void CSimulation2::SetMapSettings(const std::string& settings)
{
m->m_MapSettings = m->m_ComponentManager.GetScriptInterface().ParseJSON(settings);
JSContext* cx = m->m_ComponentManager.GetScriptInterface().GetContext();
JSAutoRequest rq(cx);
// TODO: Check if this temporary root can be removed after SpiderMonkey 31 upgrade
JS::RootedValue tmpMapSettings(cx);
m->m_ComponentManager.GetScriptInterface().ParseJSON(settings, &tmpMapSettings);
m->m_MapSettings = CScriptValRooted(cx, tmpMapSettings);
}
void CSimulation2::SetMapSettings(const CScriptValRooted& settings)
@@ -734,7 +739,11 @@ void CSimulation2::SetMapSettings(const CScriptValRooted& settings)
std::string CSimulation2::GetMapSettingsString()
{
return m->m_ComponentManager.GetScriptInterface().StringifyJSON(m->m_MapSettings.get());
JSContext* cx = m->m_ComponentManager.GetScriptInterface().GetContext();
JSAutoRequest rq(cx);
// TODO: Check if this temporary root can be removed after SpiderMonkey 31 upgrade
JS::RootedValue tmpMapSettings(cx, m->m_MapSettings.get());
return m->m_ComponentManager.GetScriptInterface().StringifyJSON(&tmpMapSettings);
}
CScriptVal CSimulation2::GetMapSettings()
@@ -929,5 +938,5 @@ std::string CSimulation2::GetAIData()
if (!scriptInterface.Eval("({})", &ais) || !scriptInterface.SetProperty(ais, "AIData", aiData))
return std::string();
return scriptInterface.StringifyJSON(ais);
return scriptInterface.StringifyJSON(&ais);
}