Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-12 02:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fix a crash if eof is unexpectedly encountered

Browse Source 
- Warn if an entity with same ENTITY_NAME is encountered
This commit is contained in:
Thomas Krijnen
2012-02-04 15:10:17 +00:00
parent 3336102b46
commit a9a5f8dc69
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcparse/IfcParse.cpp
+15 -4
View File
@@ -100,6 +100,7 @@ void File::ReadBuffer(bool inc) {
void File::Seek(unsigned int o) {
if ( !paging ) {
ptr = o;
if (ptr >= len) throw IfcException("Reading outside of file limits");
eof = false;
} else if ( o >= offset && (o < (offset+len)) ) {
ptr = o - offset;
@@ -123,7 +124,7 @@ char File::Peek() {
//
char File::Read(unsigned int o) {
if ( ! paging ) {
return buffer[o];
return buffer[o];
} else if ( o >= offset && (o < (offset+len)) ) {
return buffer[o-offset];
} else {
@@ -146,7 +147,10 @@ unsigned int File::Tell() {
void File::Inc() {
if ( ++ptr == len ) {
if ( paging ) ReadBuffer();
else eof = true;
else {
eof = true;
return;
}
}
const char current = File::Peek();
if ( current == '\n' || current == '\r' ) File::Inc();
@@ -220,6 +224,7 @@ Token Tokens::Next() {
// Omits whitespace and comments
//
std::string Tokens::TokenString(unsigned int offset) {
const bool was_eof = file->eof;
unsigned int old_offset = file->Tell();
file->Seek(offset);
bool inString = false;
@@ -238,7 +243,8 @@ std::string Tokens::TokenString(unsigned int offset) {
else if ( !inComment && c == '\'' ) return *decoder;
p = c;
}
file->Seek(old_offset);
if ( was_eof ) file->eof = true;
else file->Seek(old_offset);
return buffer;
}
@@ -580,7 +586,7 @@ bool Ifc::Init(IfcParse::File* f) {
EntityPtr e;
IfcUtil::IfcSchemaEntity entity;
if ( log1 ) std::cout << "Scanning file..." << std::endl;
while ( true ) {
while ( ! file->eof ) {
if ( currentId ) {
try {
e = new Entity(currentId,tokens);
@@ -601,6 +607,11 @@ bool Ifc::Init(IfcParse::File* f) {
L->push(entity);
ty = Ifc2x3::Type::Parent(ty);
} while ( ty > -1 );
if ( byid.find(currentId) != byid.end() ) {
std::stringstream ss;
ss << "Overwriting entity with id " << currentId;
Ifc::LogMessage("Warning",ss.str());
}
byid[currentId] = entity;
currentId = 0;
} else token = tokens->Next();