realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 18:23:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't write empty data tags

Browse Source 
Also avoid throwing if a data stream is empty so that you can still read
the schematic/pcb/library

Fixes https://gitlab.com/kicad/code/kicad/-/issues/20301

(cherry picked from commit a6fbf4bbdbc7e08c815a4b28f14a99be48aee621)
This commit is contained in:
Seth Hillbrand 2025-03-11 09:42:06 -07:00
parent 631c5ec01d
commit 5d9908647c
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/embedded_files.cpp
View File

@ -162,6 +162,13 @@ void EMBEDDED_FILES::WriteEmbeddedFiles( OUTPUTFORMATTER& aOut, bool aWriteData
{ {
const EMBEDDED_FILE& file = *entry; const EMBEDDED_FILE& file = *entry;
// Skip empty files
if( file.compressedEncodedData.empty() )
{
wxLogDebug( wxT( "Error: Embedded file '%s' is empty" ), file.name );
continue;
}
aOut.Print( "(file " ); aOut.Print( "(file " );
aOut.Print( "(name %s)", aOut.Quotew( file.name ).c_str() ); aOut.Print( "(name %s)", aOut.Quotew( file.name ).c_str() );
@ -376,7 +383,21 @@ void EMBEDDED_FILES_PARSER::ParseEmbedded( EMBEDDED_FILES* aFiles )
break; break;
case T_data: case T_data:
try
{
NeedBAR(); NeedBAR();
}
catch( const PARSE_ERROR& e )
{
// No data in the file -- due to bug in writer for 9.0.0
NeedRIGHT();
break;
}
catch( ... )
{
throw;
}
token = NextTok(); token = NextTok();
file->compressedEncodedData.reserve( 1 << 17 ); file->compressedEncodedData.reserve( 1 << 17 );