rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-30 19:52:13 +01:00
Code Issues Releases Activity

Make String::move of an invalidated String result in an invalidated String

Browse Source
This commit is contained in:
Sandeep Mistry 2016-07-12 17:29:13 -04:00
parent b8f3d2d8bb
commit f49c7ae3de
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/arduino/avr/cores/arduino/WString.cpp
View File

@ -193,7 +193,7 @@ String & String::copy(const __FlashStringHelper *pstr, unsigned int length)
void String::move(String &rhs) void String::move(String &rhs)
{ {
if (buffer) { if (buffer) {
if (capacity >= rhs.len) { if (rhs && capacity >= rhs.len) {
strcpy(buffer, rhs.buffer); strcpy(buffer, rhs.buffer);
len = rhs.len; len = rhs.len;
rhs.len = 0; rhs.len = 0;

2
hardware/arduino/sam/cores/arduino/WString.cpp
View File

@ -195,7 +195,7 @@ String & String::copy(const __FlashStringHelper *pstr, unsigned int length)
void String::move(String &rhs) void String::move(String &rhs)
{ {
if (buffer) { if (buffer) {
if (capacity >= rhs.len) { if (rhs && capacity >= rhs.len) {
strcpy(buffer, rhs.buffer); strcpy(buffer, rhs.buffer);
len = rhs.len; len = rhs.len;
rhs.len = 0; rhs.len = 0;