Fixing IPAddress::fromString for '1.1.1.' as well as '...'

aentinger · aentinger · commit 4574f2aec75f · 2020-10-07T17:40:56.000+02:00
diff --git a/api/IPAddress.cpp b/api/IPAddress.cpp
@@ -49,15 +49,15 @@ bool IPAddress::fromString(const char *address)
 {
     // TODO: add support for "a", "a.b", "a.b.c" formats
 
-    uint16_t acc = 0; // Accumulator
+    int16_t acc = -1; // Accumulator
     uint8_t dots = 0;
 
     while (*address)
     {
         char c = *address++;
         if (c >= '0' && c <= '9')
         {
-            acc = acc * 10 + (c - '0');
+            acc = (acc < 0) ? (c - '0') : acc * 10 + (c - '0');
             if (acc > 255) {
                 // Value out of [0..255] range
                 return false;
@@ -69,8 +69,12 @@ bool IPAddress::fromString(const char *address)
                 // Too much dots (there must be 3 dots)
                 return false;
             }
+            if (acc < 0) {
+                /* No value between dots, e.g. '1..' */
+                return false;
+            }
             _address.bytes[dots++] = acc;
-            acc = 0;
+            acc = -1;
         }
         else
         {
@@ -83,6 +87,10 @@ bool IPAddress::fromString(const char *address)
         // Too few dots (there must be 3 dots)
         return false;
     }
+    if (acc < 0) {
+        /* No value between dots, e.g. '1..' */
+        return false;
+    }
     _address.bytes[3] = acc;
     return true;
 }
diff --git a/test/src/IPAddress/test_fromString.cpp b/test/src/IPAddress/test_fromString.cpp
@@ -41,7 +41,6 @@ TEST_CASE ("Extract valid IP address 'fromString(const String &)'", "[IPAddress-
   REQUIRE(ip[3] == 2);
 }
 
-
 TEST_CASE ("Extract invalid IP address 'fromString(const char *)'", "[IPAddress-fromString-03]")
 {
   arduino::IPAddress ip;
@@ -53,6 +52,7 @@ TEST_CASE ("Extract invalid IP address 'fromString(const char *)'", "[IPAddress-
   REQUIRE(ip.fromString("1.1.")      == false);
   REQUIRE(ip.fromString("1.1.1")     == false);
   REQUIRE(ip.fromString("1.1.1.")    == false);
+  REQUIRE(ip.fromString("...")       == false);
   REQUIRE(ip.fromString("256.1.1.1") == false);
   REQUIRE(ip.fromString("a.1.1.1")   == false);
   REQUIRE(ip.fromString("-.1.1.1")   == false);

Original file line number	Diff line number	Diff line change
`@@ -49,15 +49,15 @@ bool IPAddress::fromString(const char *address)`
`49`	`49`	`{`
`50`	`50`	`// TODO: add support for "a", "a.b", "a.b.c" formats`
`51`	`51`
`52`		`- uint16_t acc = 0; // Accumulator`
	`52`	`+ int16_t acc = -1; // Accumulator`
`53`	`53`	`uint8_t dots = 0;`
`54`	`54`
`55`	`55`	`while (*address)`
`56`	`56`	`{`
`57`	`57`	`char c = *address++;`
`58`	`58`	`if (c >= '0' && c <= '9')`
`59`	`59`	`{`
`60`		`- acc = acc * 10 + (c - '0');`
	`60`	`+ acc = (acc < 0) ? (c - '0') : acc * 10 + (c - '0');`
`61`	`61`	`if (acc > 255) {`
`62`	`62`	`// Value out of [0..255] range`
`63`	`63`	`return false;`
`@@ -69,8 +69,12 @@ bool IPAddress::fromString(const char *address)`
`69`	`69`	`// Too much dots (there must be 3 dots)`
`70`	`70`	`return false;`
`71`	`71`	`}`
	`72`	`+ if (acc < 0) {`
	`73`	`+ /* No value between dots, e.g. '1..' */`
	`74`	`+ return false;`
	`75`	`+ }`
`72`	`76`	`_address.bytes[dots++] = acc;`
`73`		`- acc = 0;`
	`77`	`+ acc = -1;`
`74`	`78`	`}`
`75`	`79`	`else`
`76`	`80`	`{`
`@@ -83,6 +87,10 @@ bool IPAddress::fromString(const char *address)`
`83`	`87`	`// Too few dots (there must be 3 dots)`
`84`	`88`	`return false;`
`85`	`89`	`}`
	`90`	`+ if (acc < 0) {`
	`91`	`+ /* No value between dots, e.g. '1..' */`
	`92`	`+ return false;`
	`93`	`+ }`
`86`	`94`	`_address.bytes[3] = acc;`
`87`	`95`	`return true;`
`88`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ TEST_CASE ("Extract valid IP address 'fromString(const String &)'", "[IPAddress-`
`41`	`41`	`REQUIRE(ip[3] == 2);`
`42`	`42`	`}`
`43`	`43`
`44`		`-`
`45`	`44`	`TEST_CASE ("Extract invalid IP address 'fromString(const char *)'", "[IPAddress-fromString-03]")`
`46`	`45`	`{`
`47`	`46`	`arduino::IPAddress ip;`
`@@ -53,6 +52,7 @@ TEST_CASE ("Extract invalid IP address 'fromString(const char *)'", "[IPAddress-`
`53`	`52`	`REQUIRE(ip.fromString("1.1.") == false);`
`54`	`53`	`REQUIRE(ip.fromString("1.1.1") == false);`
`55`	`54`	`REQUIRE(ip.fromString("1.1.1.") == false);`
	`55`	`+ REQUIRE(ip.fromString("...") == false);`
`56`	`56`	`REQUIRE(ip.fromString("256.1.1.1") == false);`
`57`	`57`	`REQUIRE(ip.fromString("a.1.1.1") == false);`
`58`	`58`	`REQUIRE(ip.fromString("-.1.1.1") == false);`