fly/flightgear
1
0
Fork 0
Code Activity

Copy name into buffer on release builds

Browse source 
Problem seen with Nasal setChildren/setValues where names were not
being passed down the stack.  Identified as over-zealous IF_DEF
to remove unused variable compiler which meant snprintf was not being called
for non debug builds (see c177aeb623)

Fix is to change assert() calls to an naRuntime error, which ensures
that the len variable is always used and is
more appropriate as buffer overrun could occur in any release build if
someone tried to set a name of >1024 characters.
This commit is contained in:
Stuart Buchanan 2019-02-09 18:11:56 +00:00
parent 2fdc24c109
commit b166b523b2
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -155,7 +155,7 @@ static naRef f_getAttribute(naContext c, naRef me, int argc, naRef* args)
else if(!strcmp(a, "userarchive")) attr = SGPropertyNode::USERARCHIVE;
else if(!strcmp(a, "preserve")) attr = SGPropertyNode::PRESERVE;
else if(!strcmp(a, "protected")) attr = SGPropertyNode::PROTECTED;
else {
naRuntimeError(c, "props.getAttribute() with invalid attribute");
return naNil();
@ -180,7 +180,7 @@ static naRef f_setAttribute(naContext c, naRef me, int argc, naRef* args)
node->getPath().c_str());
return naNil();
}
MOVETARGET(naVec_size(argv) > 2, false);
naRef val = naVec_get(argv, 0);
if(naVec_size(argv) == 1 && naIsNum(val)) {
@ -441,10 +441,10 @@ static naRef f_setChildrenHelper(naContext c, SGPropertyNode_ptr node, char* nam
} else if (naIsVector(val)) {
char nameBuf[1024];
for (int i = 0; i < naVec_size(val); i++) {
#ifndef NDEBUG
const auto len = ::snprintf(nameBuf, sizeof(nameBuf), "%s[%i]", name, i);
#endif
assert(len < (int) sizeof(nameBuf));
if ((len < 0) || (len >= (int) sizeof(nameBuf))) {
naRuntimeError(c, "Failed to create buffer for property name in setChildren");
}
ret = f_setChildrenHelper(c, node, nameBuf, naVec_get(val, i));
}
} else if (naIsNil(val)) {
@ -668,7 +668,7 @@ static naRef f_removeChildren(naContext c, naRef me, int argc, naRef* args)
n->getPath() << " is protected");
continue;
}
node->removeChild(i);
naVec_append(result, propNodeGhostCreate(c, n));
}