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

kicad2step: Handle escaped quotes in sexpr parser

This commit is contained in:
Maciej Suminski 2018-05-14 13:28:12 +02:00
parent 509793a5b4
commit 161b4a56fc
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utils/kicad2step/sexpr/sexpr_parser.cpp
View File

@ -117,7 +117,15 @@ namespace SEXPR
else if( *it == '"' ) else if( *it == '"' )
{ {
size_t startPos = std::distance(aString.begin(), it) + 1; size_t startPos = std::distance(aString.begin(), it) + 1;
size_t closingPos = aString.find_first_of('"', startPos); size_t closingPos = startPos > 0 ? startPos - 1 : startPos;
// find the closing quote character, be sure it is not escaped
do
{
closingPos = aString.find_first_of( '"', closingPos + 1 );
}
while( closingPos != std::string::npos
&& ( closingPos > 0 && aString[closingPos - 1] == '\\' ) );
if( closingPos != std::string::npos ) if( closingPos != std::string::npos )
{ {