fly/flightgear
1
0
Fork 0
Code Activity

When attempting to pass a NaN between Nasal and property nodes, catch this.

Browse source
This commit is contained in:
James Turner 2010-10-20 00:08:57 +01:00
parent b26705d3be
commit ce2a112639
2 changed files with 38 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Scripting/NasalSys.cxx
View file

@ -186,8 +186,16 @@ static naRef f_getprop(naContext c, naRef me, int argc, naRef* args)
case props::BOOL: case props::INT:
case props::LONG: case props::FLOAT:
case props::DOUBLE:
return naNum(p->getDoubleValue());
{
double dv = p->getDoubleValue();
if (osg::isNaN(dv)) {
SG_LOG(SG_GENERAL, SG_ALERT, "Nasal getprop: property " << p->getPath() << " is NaN");
naRuntimeError(c, "getprop() would have read NaN");
}
return naNum(dv);
}
case props::STRING:
case props::UNSPECIFIED:
{
@ -234,6 +242,11 @@ static naRef f_setprop(naContext c, naRef me, int argc, naRef* args)
naRef n = naNumValue(val);
if(naIsNil(n))
naRuntimeError(c, "setprop() value is not string or number");
if (osg::isNaN(n.num)) {
naRuntimeError(c, "setprop() passed a NaN");
}
result = props->setDoubleValue(buf, n.num);
}
} catch (const string& err) {

26
src/Scripting/nasal-props.cxx
View file

@ -169,7 +169,16 @@ static naRef f_getValue(naContext c, naRef me, int argc, naRef* args)
case props::BOOL: case props::INT:
case props::LONG: case props::FLOAT:
case props::DOUBLE:
return naNum((*node)->getDoubleValue());
{
double dv = (*node)->getDoubleValue();
if (osg::isNaN(dv)) {
SG_LOG(SG_GENERAL, SG_ALERT, "Nasal getValue: property " << (*node)->getPath() << " is NaN");
naRuntimeError(c, "props.getValue() would have read NaN");
}
return naNum(dv);
}
case props::STRING:
case props::UNSPECIFIED:
return NASTR((*node)->getStringValue());
@ -217,7 +226,13 @@ static naRef f_setValue(naContext c, naRef me, int argc, naRef* args)
naRef n = naNumValue(val);
if(naIsNil(n))
naRuntimeError(c, "props.setValue() with non-number");
result = (*node)->setDoubleValue(naNumValue(val).num);
double d = naNumValue(val).num;
if (osg::isNaN(d)) {
naRuntimeError(c, "props.setValue() passed a NaN");
}
result = (*node)->setDoubleValue(d);
}
return naNum(result);
}
@ -250,8 +265,13 @@ static naRef f_setDoubleValue(naContext c, naRef me, int argc, naRef* args)
{
NODEARG();
naRef r = naNumValue(naVec_get(argv, 0));
if(naIsNil(r))
if (naIsNil(r))
naRuntimeError(c, "props.setDoubleValue() with non-number");
if (osg::isNaN(r.num)) {
naRuntimeError(c, "props.setDoubleValue() passed a NaN");
}
return naNum((*node)->setDoubleValue(r.num));
}