Merge branch 'invalidated-string-move' of https://github.com/sandeepmistry/Arduino

cmaglie · cmaglie · commit 9e00b14aa04b · 2016-07-18T18:30:23.000+02:00
diff --git a/arduino/avr/cores/arduino/WString.cpp b/arduino/avr/cores/arduino/WString.cpp
@@ -193,7 +193,7 @@ String & String::copy(const __FlashStringHelper *pstr, unsigned int length)
 void String::move(String &rhs)
 {
 	if (buffer) {
-		if (capacity >= rhs.len) {
+		if (rhs && capacity >= rhs.len) {
 			strcpy(buffer, rhs.buffer);
 			len = rhs.len;
 			rhs.len = 0;

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ String & String::copy(const __FlashStringHelper *pstr, unsigned int length)`
`193`	`193`	`void String::move(String &rhs)`
`194`	`194`	`{`
`195`	`195`	`if (buffer) {`
`196`		`- if (capacity >= rhs.len) {`
	`196`	`+ if (rhs && capacity >= rhs.len) {`
`197`	`197`	`strcpy(buffer, rhs.buffer);`
`198`	`198`	`len = rhs.len;`
`199`	`199`	`rhs.len = 0;`