Skip to content

Fix hang for compact() on empty hex #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bollenn wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix hang for compact() on empty hex #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2addfa0
allow to ignore leaving fill pattern bytes out of hex file
bollenn Jan 6, 2023
7fa876c
correct logic for is_set function
bollenn Jun 16, 2024
fbfa0d9
Merge branch 'fix-is-set' of github.com:bollenn/libintelhex into igno…
bollenn Jun 16, 2024
ccf17c2
do not endless hang when empty hex file is used for compacting
bollenn Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/intelhex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ namespace intelhex

value_type& operator[](address_type); //Array access operator
value_type get(address_type); // Return the value at address
void set(address_type, value_type); // Set the value at address
void set(address_type, value_type, bool ignore_fill=false); // Set the value at address

void load(const std::string&); // Load from a file
void read(std::istream &); // Read data from an input stream
Expand Down
34 changes: 18 additions & 16 deletions src/intelhex.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ namespace intelhex
}

// Set the value at address or create a new element using value
void hex_data::set(address_type address, value_type value)
void hex_data::set(address_type address, value_type value, bool ignore_fill)
{
if( value == fill() ) // Handle fill values
if( !ignore_fill && value == fill() ) // Handle fill values
{
erase(address); // If the address is already set, erase it
return;
Expand Down Expand Up @@ -93,19 +93,21 @@ namespace intelhex
// Merge adjacent blocks
void hex_data::compact()
{
iterator previous = blocks.begin();
iterator i = previous;

for(++i; i != blocks.end(); ++i)
{
if( (previous->first + previous->second.size()) == i->first )
{
previous->second.insert(previous->second.end(), i->second.begin(), i->second.end());
blocks.erase(i);
i = previous;
}
previous = i;
}
if (blocks.size() > 0) {
iterator previous = blocks.begin();
iterator i = previous;

for(++i; i != blocks.end(); ++i)
{
if( (previous->first + previous->second.size()) == i->first )
{
previous->second.insert(previous->second.end(), i->second.begin(), i->second.end());
blocks.erase(i);
i = previous;
}
previous = i;
}
}
}

// Delete all allocated memory
Expand Down Expand Up @@ -290,7 +292,7 @@ namespace intelhex
while( (i!=blocks.rend()) && (i->first > addr))
++i;

if( (addr - i->first) > i->second.size() )
if( (addr - i->first) >= i->second.size() )
return false;
else
return true;
Expand Down