Cherry pick of line-ending-safety fix from 5.1.

Fixes: lp:1842943
* https://bugs.launchpad.net/kicad/+bug/1842943

common/gestfich.cpp

@@ -337,7 +337,12 @@ bool doPrintFile( const wxString& file, bool aDryRun )
     }
 #endif
 
-    DisplayError( NULL, wxString::Format( _( "Cannot print '%s'.\n\nUnknown filetype." ), file ) );
+    if( !aDryRun )
+    {
+        DisplayError( nullptr, wxString::Format( _( "Cannot print '%s'.\n\nUnknown filetype." ),
+                                                 file ) );
+    }
+
     return false;
 }
 

common/string.cpp

@@ -246,8 +246,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 ret;

include/kicad_string.h

@@ -87,7 +87,7 @@ int ReadDelimitedText( wxString* aDest, const char* aSource );
  * @param aString is the input string to convert.
  * @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.