amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 05:36:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed possible crash in dependency checking

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1113 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-08-08 23:53:59 +00:00
parent e575af3320
commit d14af1c43a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/dependency.cpp
+6 -1
View File
@@ -67,10 +67,12 @@ class DependencyUnion : public ScriptValue {
// Unify two values from different execution paths // Unify two values from different execution paths
void unify(ScriptValueP& a, const ScriptValueP& b) { void unify(ScriptValueP& a, const ScriptValueP& b) {
assert(a && b);
if (a != b) a = new_intrusive2<DependencyUnion>(a,b); if (a != b) a = new_intrusive2<DependencyUnion>(a,b);
} }
// Unify two values from different execution paths // Unify two values from different execution paths
ScriptValueP unified(const ScriptValueP& a, const ScriptValueP& b) { ScriptValueP unified(const ScriptValueP& a, const ScriptValueP& b) {
assert(a && b);
if (a == b) return a; if (a == b) return a;
else return new_intrusive2<DependencyUnion>(a,b); else return new_intrusive2<DependencyUnion>(a,b);
} }
@@ -159,7 +161,10 @@ ScriptValueP Context::dependencies(const Dependency& dep, const Script& script)
} }
// unify bindings // unify bindings
FOR_EACH(v, j->bindings) { FOR_EACH(v, j->bindings) {
setVariable(v.variable, unified(variables[v.variable].value, v.value.value) ); ScriptValueP old_value = variables[v.variable].value;
if (old_value) {
setVariable(v.variable, unified(old_value, v.value.value) );
}
} }
delete j; delete j;
} }