Commit 267bab1

authored

Merge pull request #203 from arduino/fix-178

Fix of empty string printed in case of a 64-bit unsigned integer.

2 parents b052976 + 754aa9b commit 267bab1Copy full SHA for 267bab1

File tree

+23

-5

lines changed

+23

-5

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -287,6 +287,12 @@ size_t Print::printULLNumber(unsigned long long n64, uint8_t base)`
`287`	`287`	`uint8_t i = 0;`
`288`	`288`	`uint8_t innerLoops = 0;`
`289`	`289`
	`290`	`+ // Special case workaround https://github.com/arduino/ArduinoCore-API/issues/178`
	`291`	`+ if (n64 == 0) {`
	`292`	`+ write('0');`
	`293`	`+ return 1;`
	`294`	`+ }`
	`295`	`+`
`290`	`296`	`// prevent crash if called with base == 1`
`291`	`297`	`if (base < 2) base = 10;`
`292`	`298`

Lines changed: 17 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -110,12 +110,24 @@ TEST_CASE ("Print::print(unsigned long long, int = DEC\|HEX\|OCT\|BIN)", "[Print-pr`
`110`	`110`	`{`
`111`	`111`	`PrintMock mock;`
`112`	`112`
`113`		`- unsigned long long const val = 17;`
	`113`	`+ GIVEN("a value of zero ...")`
	`114`	`+ {`
	`115`	`+ unsigned long long const val = 0;`
`114`	`116`
`115`		`- WHEN("DEC") { mock.print(val, DEC); REQUIRE(mock._str == "17"); }`
`116`		`- WHEN("HEX") { mock.print(val, HEX); REQUIRE(mock._str == "11"); }`
`117`		`- WHEN("OCT") { mock.print(val, OCT); REQUIRE(mock._str == "21"); }`
`118`		`- WHEN("BIN") { mock.print(val, BIN); REQUIRE(mock._str == "10001"); }`
	`117`	`+ WHEN("DEC") { mock.print(val, DEC); REQUIRE(mock._str == "0"); }`
	`118`	`+ WHEN("HEX") { mock.print(val, HEX); REQUIRE(mock._str == "0"); }`
	`119`	`+ WHEN("OCT") { mock.print(val, OCT); REQUIRE(mock._str == "0"); }`
	`120`	`+ WHEN("BIN") { mock.print(val, BIN); REQUIRE(mock._str == "0"); }`
	`121`	`+ }`
	`122`	`+ GIVEN("a non-zero value ...")`
	`123`	`+ {`
	`124`	`+ unsigned long long const val = 17;`
	`125`	`+`
	`126`	`+ WHEN("DEC") { mock.print(val, DEC); REQUIRE(mock._str == "17"); }`
	`127`	`+ WHEN("HEX") { mock.print(val, HEX); REQUIRE(mock._str == "11"); }`
	`128`	`+ WHEN("OCT") { mock.print(val, OCT); REQUIRE(mock._str == "21"); }`
	`129`	`+ WHEN("BIN") { mock.print(val, BIN); REQUIRE(mock._str == "10001"); }`
	`130`	`+ }`
`119`	`131`	`}`
`120`	`132`
`121`	`133`	`TEST_CASE ("Print::print(double, int = 2)", "[Print-print-10]")`

Comments

(0)