Skip to content

Fix segmentation faults/core dumps on int/string 2 char conversion #4

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
RobinR1 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix segmentation faults/core dumps on int/string 2 char conversion #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bd10d1
Fix core dump on int2char call
RobinR1 Apr 1, 2019
856662b
Fix core dump on empty event task
RobinR1 Apr 1, 2019
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
11 changes: 7 additions & 4 deletions arduino/miflo/miflo.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,17 @@ bool todo_done[ 4 ] = { false, false, false, false };
char current_job_string[200] = "";

char* string2char(String s) {
static char *p;
if (s.length() != 0) {
char *p = const_cast<char*>(s.c_str());
return p;
p = const_cast<char*>(s.c_str());
} else {
*p = 0; //empty string
}
return p;
}

char* int2char(int n) {
char s[16];
static char s[16];
itoa(n, s, 10);
return s;
}
Expand Down Expand Up @@ -743,7 +746,7 @@ void show_upcoming_events() {
int x = 0;
for ( std::map<int, String>::iterator i = cache.begin(); i != cache.end(); i++ ) {
GD.cmd_text(20, 60 + x * 20, 20, 0, string2char( format_time( i->first / 10000, (i->first / 100) % 100, i->first % 100 ) ) );
GD.cmd_text(80, 60 + x * 20, 20, 0, string2char(i->second));
GD.cmd_text(80, 60 + x * 20, 20, 0, string2char( i->second ));
x++;
}

Expand Down