haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

altium: loosen up ReadProperties check a bit, to allow reading of likely malformed altium files.

This commit is contained in:
Thomas Pointhuber 2021-02-07 16:51:05 +01:00
parent f6aa25df52
commit c255dede17
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/plugins/altium/altium_parser.cpp
View File

@ -83,12 +83,20 @@ std::map<wxString, wxString> ALTIUM_PARSER::ReadProperties()
std::map<wxString, wxString> kv; std::map<wxString, wxString> kv;
uint32_t length = Read<uint32_t>(); uint32_t length = Read<uint32_t>();
if( length > GetRemainingBytes() || m_pos[length - 1] != '\0' ) if( length > GetRemainingBytes() )
{ {
m_error = true; m_error = true;
return kv; return kv;
} }
// There is one case by kliment where Board6 ends with "|NEARDISTANCE=1000mi".
// Both the 'l' and the null-byte are missing, which looks like Altium swallowed two bytes.
if( m_pos[length - 1] != '\0' )
{
wxLogError( "For Altium import, we assumes a null byte at the end of a list of properties. "
"Because this is missing, imported data might be malformed or missing." );
}
//we use std::string because std::string can handle NULL-bytes //we use std::string because std::string can handle NULL-bytes
//wxString would end the string at the first NULL-byte //wxString would end the string at the first NULL-byte
std::string str = std::string( m_pos, length - 1 ); std::string str = std::string( m_pos, length - 1 );