Skip to content
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

Jump to bottom

WString: change strcpy() to memcpy() #530

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WString: change strcpy() to memcpy() #530

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions cores/arduino/WString.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ String & String::copy(const char *cstr, unsigned int length)
return *this;
}
len = length;
strcpy(buffer, cstr);
memcpy(buffer, cstr, length + 1);
return *this;
}

Expand All @@ -185,7 +185,7 @@ String & String::copy(const __FlashStringHelper *pstr, unsigned int length)
return *this;
}
len = length;
strcpy_P(buffer, (PGM_P)pstr);
memcpy_P(buffer, (PGM_P)pstr, length + 1);
return *this;
}

Expand All @@ -194,7 +194,7 @@ void String::move(String &rhs)
{
if (buffer) {
if (rhs && capacity >= rhs.len) {
strcpy(buffer, rhs.buffer);
memcpy(buffer, rhs.buffer, rhs.len + 1);
len = rhs.len;
rhs.len = 0;
return;
Expand Down Expand Up @@ -266,8 +266,9 @@ unsigned char String::concat(const char *cstr, unsigned int length)
if (!cstr) return 0;
if (length == 0) return 1;
if (!reserve(newlen)) return 0;
strcpy(buffer + len, cstr);
memcpy(buffer + len, cstr, length);
len = newlen;
buffer[len] = 0;
return 1;
}

Expand Down Expand Up @@ -341,7 +342,7 @@ unsigned char String::concat(const __FlashStringHelper * str)
if (length == 0) return 1;
unsigned int newlen = len + length;
if (!reserve(newlen)) return 0;
strcpy_P(buffer + len, (const char *) str);
memcpy_P(buffer + len, (const char *) str, length + 1);
len = newlen;
return 1;
}
Expand Down Expand Up @@ -653,6 +654,7 @@ void String::replace(const String& find, const String& replace)
}
} else if (diff < 0) {
char *writeTo = buffer;
char *end = buffer + len;
while ((foundAt = strstr(readFrom, find.buffer)) != NULL) {
unsigned int n = foundAt - readFrom;
memcpy(writeTo, readFrom, n);
Expand All @@ -662,7 +664,7 @@ void String::replace(const String& find, const String& replace)
readFrom = foundAt + find.len;
len += diff;
}
strcpy(writeTo, readFrom);
memcpy(writeTo, readFrom, end - readFrom + 1);
} else {
unsigned int size = len; // compute size needed for result
while ((foundAt = strstr(readFrom, find.buffer)) != NULL) {
Expand Down