Fixed eeschema crash when reading a void library file (31406023) · Commits · Elphel / kicad-source-mirror

eeschema/class_library.cpp

+11 −0

Original line number	Diff line number	Diff line
		@@ -175,6 +175,17 @@ CMP_LIB_ENTRY* CMP_LIBRARY::FindEntry( const wxChar* aName, LibrEntryType aType
		return NULL;
		}

		/**
		* Return the first entry in the library.
		* @return The first entry or NULL if the library has no entries.
		*/
		CMP_LIB_ENTRY* CMP_LIBRARY::GetFirstEntry()
		{
		if( entries.size() )
		return &entries.front();
		else
		return NULL;
		}

		LIB_COMPONENT* CMP_LIBRARY::FindComponent( const wxChar* aName )
		{

+1 −4

Original line number	Diff line number	Diff line
		@@ -317,10 +317,7 @@ public:
		*
		* @return The first entry or NULL if the library has no entries.
		*/
		CMP_LIB_ENTRY* GetFirstEntry()
		{
		return &entries.front();
		}
		CMP_LIB_ENTRY* GetFirstEntry();

		/**
		* Find next library entry by /a aName.

+3 −4

Original line number	Diff line number	Diff line
		@@ -706,7 +706,7 @@ static int ConvertBusToMembers( NETLIST_OBJECT_LIST& aNetItemBuffer,
		else
		BusLabel.m_Type = NET_BUSLABELMEMBER;

		/* Conversion of BusLabel in the root of the Label + the number of wire. */
		/* Conversion of BusLabel to the root Label name + the member id like mybus0, mybus1 ... */
		BufLine = BusLabel.m_Label->Left( RootBusNameLength );

		BusMember = FirstNumWireBus;
		@@ -721,8 +721,7 @@ static int ConvertBusToMembers( NETLIST_OBJECT_LIST& aNetItemBuffer,
		NETLIST_OBJECT* new_label = new NETLIST_OBJECT( BusLabel );
		NumItem++;

		/* Conversion of BusLabel in the root of the Label + the number
		* of wire */
		/* Conversion of BusLabel to the root name + the current member id.*/
		BufLine = BusLabel.m_Label->Left( RootBusNameLength );
		BufLine << BusMember;
		new_label->m_Label = new wxString( BufLine );