Skip to content

Commit f49c7ae

Browse files
committed
Make String::move of an invalidated String result in an invalidated String
1 parent b8f3d2d commit f49c7ae

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

hardware/arduino/avr/cores/arduino/WString.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ String & String::copy(const __FlashStringHelper *pstr, unsigned int length)
193193
void String::move(String &rhs)
194194
{
195195
if (buffer) {
196-
if (capacity >= rhs.len) {
196+
if (rhs && capacity >= rhs.len) {
197197
strcpy(buffer, rhs.buffer);
198198
len = rhs.len;
199199
rhs.len = 0;

hardware/arduino/sam/cores/arduino/WString.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ String & String::copy(const __FlashStringHelper *pstr, unsigned int length)
195195
void String::move(String &rhs)
196196
{
197197
if (buffer) {
198-
if (capacity >= rhs.len) {
198+
if (rhs && capacity >= rhs.len) {
199199
strcpy(buffer, rhs.buffer);
200200
len = rhs.len;
201201
rhs.len = 0;

0 commit comments

Comments
 (0)