Commit411e44a

committed

Fix implementation of String::replace(const String& find, const String& replace) when 'find' len is higher than 'replace' len

1 parente4febf7 commit411e44aCopy full SHA for 411e44a

File tree

+13

-11

lines changed

+13

-11

lines changed

Lines changed: 13 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -646,18 +646,22 @@ void String::replace(const String& find, const String& replace)`
`646`	`646`	`readFrom = foundAt + replace.len;`
`647`	`647`	`}`
`648`	`648`	`}elseif (diff <0) {`
`649`		`-char *writeTo = buffer;`
	`649`	`+unsignedint size = len;// compute size needed for result`
`650`	`650`	`while ((foundAt =strstr(readFrom, find.buffer)) !=NULL) {`
`651`		`-unsignedint n = foundAt - readFrom;`
`652`		`-memcpy(writeTo, readFrom, n);`
`653`		`-writeTo += n;`
`654`		`-memcpy(writeTo, replace.buffer, replace.len);`
`655`		`-writeTo += replace.len;`
`656`	`651`	`readFrom = foundAt + find.len;`
`657`		`-len += diff;`
	`652`	`+diff =0 - diff;`
	`653`	`+size -= diff;`
	`654`	`+}`
	`655`	`+if (size == len)return;`
	`656`	`+int index = len -1;`
	`657`	`+while (index >=0 && (index =lastIndexOf(find, index)) >=0) {`
	`658`	`+readFrom = buffer + index + find.len;`
	`659`	`+memmove(readFrom - diff, readFrom, len - (readFrom - buffer));`
	`660`	`+len -= diff;`
	`661`	`+buffer[len] =0;`
	`662`	`+memcpy(buffer + index, replace.buffer, replace.len);`
	`663`	`+index--;`
`658`	`664`	`}`
`659`		`-if (writeTo != readFrom)`
`660`		`-strcpy(writeTo, readFrom);`
`661`	`665`	`}else {`
`662`	`666`	`unsignedint size = len;// compute size needed for result`
`663`	`667`	`while ((foundAt =strstr(readFrom, find.buffer)) !=NULL) {`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,4 @@ TEST_CASE ("Testing String::replace(String, String) substr 'find' smaller than '`
`56`	`56`	`arduino::Stringstr("Hello Arduino!");`
`57`	`57`	`str.replace(arduino::String("ll"),arduino::String("111"));`
`58`	`58`	`REQUIRE(strcmp(str.c_str(),"He111o Arduino!") ==0);`
`59`		`-//REQUIRE(strcmp("He11 Arduino!", "He11 Arduino!") == 0);`
`60`		`-//REQUIRE(str.startsWith("Hel1o") == 0);`
`61`	`59`	`}`

Comments

(0)