Commit 8ae5b5f

committed

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

2 parents 5e146c4 + 5dd628a commit 8ae5b5fCopy full SHA for 8ae5b5f

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

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;`

Comments

(0)