Skip to content

String index fixes and cleanups #1937

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

Merged
merged 4 commits into from
Sep 12, 2014
Merged

String index fixes and cleanups #1937

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b90124
Remove unneeded check in String::remove(unsigned int)
matthijskooijman Mar 16, 2014
2068f88
Fix bounds check in String::remove()
matthijskooijman Mar 16, 2014
86015f4
Simplify String::remove(unsigned int)
matthijskooijman Mar 16, 2014
04dba1e
Fix off-by-one in String::substring
matthijskooijman Apr 24, 2014
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: 6 additions & 5 deletions hardware/arduino/avr/cores/arduino/WString.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ String String::substring(unsigned int left, unsigned int right) const
left = temp;
}
String out;
if (left > len) return out;
if (left >= len) return out;
if (right > len) right = len;
char temp = buffer[right]; // save the replaced character
buffer[right] = '\0';
Expand Down Expand Up @@ -684,15 +684,16 @@ void String::replace(const String& find, const String& replace)
}

void String::remove(unsigned int index){
if (index >= len) { return; }
int count = len - index;
remove(index, count);
// Pass the biggest integer as the count. The remove method
// below will take care of truncating it at the end of the
// string.
remove(index, (unsigned int)-1);
}

void String::remove(unsigned int index, unsigned int count){
if (index >= len) { return; }
if (count <= 0) { return; }
if (index + count > len) { count = len - index; }
if (count > len - index) { count = len - index; }
char *writeTo = buffer + index;
len = len - count;
strncpy(writeTo, buffer + index + count,len - index);
Expand Down