Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-20 06:58:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

string_arg_filter: make sure the argument type is string

Browse Source
This commit is contained in:
Stinkfist0
2017-02-24 14:57:29 +02:00
committed by Thomas Krijnen
parent 5d7b392415
commit 8e44290341
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomFilter.h
+5 -2
View File
@@ -120,6 +120,7 @@ namespace IfcGeom
} }
}; };
/// @note supports only string arguments for now
struct string_arg_filter : public wildcard_filter struct string_arg_filter : public wildcard_filter
{ {
// Using this for now in order to overcome the fact that different classes have the argument at different indices. // Using this for now in order to overcome the fact that different classes have the argument at different indices.
@@ -145,7 +146,8 @@ namespace IfcGeom
for (arg_map_t::const_iterator it = args.begin(); it != args.end(); ++it) { for (arg_map_t::const_iterator it = args.begin(); it != args.end(); ++it) {
IfcWrite::IfcWritableEntity dummy(it->first); IfcWrite::IfcWritableEntity dummy(it->first);
IfcUtil::IfcBaseClass* base = IfcSchema::SchemaEntity(&dummy); IfcUtil::IfcBaseClass* base = IfcSchema::SchemaEntity(&dummy);
assert(it->second < base->getArgumentCount() && "Invalid argument index"); assert(it->second < base->getArgumentType(it->second) == IfcUtil::Argument_STRING && "Argument type not string");
assert(it->second < base->getArgumentCount() && "Argument index out of bounds");
delete base; delete base;
} }
#endif #endif
@@ -154,7 +156,8 @@ namespace IfcGeom
std::string value(IfcSchema::IfcProduct* prod) const std::string value(IfcSchema::IfcProduct* prod) const
{ {
for (arg_map_t::const_iterator it = args.begin(); it != args.end(); ++it) { for (arg_map_t::const_iterator it = args.begin(); it != args.end(); ++it) {
if (prod->is(it->first) && it->second < prod->entity->getArgumentCount()) { if (prod->is(it->first) && it->second < prod->entity->getArgumentCount() &&
prod->getArgumentType(it->second) == IfcUtil::Argument_STRING) {
Argument *arg = prod->entity->getArgument(it->second); Argument *arg = prod->entity->getArgument(it->second);
if (!arg->isNull()) { if (!arg->isNull()) {
return *arg; return *arg;