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

Add some protection against newlines sneaking into the file. 

Fixes: lp:1842943
* https://bugs.launchpad.net/kicad/+bug/1842943
This commit is contained in:
Jeff Young 2019-09-07 02:32:22 +01:00
parent 75bb864237
commit 848873d87e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/string.cpp
View File

@ -209,8 +209,12 @@ int ReadDelimitedText( char* aDest, const char* aSource, int aDestSize )
} }
std::string EscapedUTF8( const wxString& aString ) std::string EscapedUTF8( wxString aString )
{ {
// No new-lines allowed in quoted strings
aString.Replace( "\r\n", "\r" );
aString.Replace( "\n", "\r" );
std::string utf8 = TO_UTF8( aString ); std::string utf8 = TO_UTF8( aString );
std::string ret; std::string ret;

2
include/kicad_string.h
View File

@ -81,7 +81,7 @@ int ReadDelimitedText( wxString* aDest, const char* aSource );
* @param aString is the input string to convert. * @param aString is the input string to convert.
* @return std::string - the escaped input text, without the wrapping double quotes. * @return std::string - the escaped input text, without the wrapping double quotes.
*/ */
std::string EscapedUTF8( const wxString& aString ); std::string EscapedUTF8( wxString aString );
/** /**
* Return a new wxString escaped for embedding in HTML. * Return a new wxString escaped for embedding in HTML.