MbedSocketClass: add checks on mac address string

pennam · pennam · commit b3a717172646 · 2024-11-06T09:30:10.000+01:00
diff --git a/libraries/SocketWrapper/src/SocketHelpers.cpp b/libraries/SocketWrapper/src/SocketHelpers.cpp
@@ -11,7 +11,11 @@ uint8_t* arduino::MbedSocketClass::macAddress(uint8_t* mac) {
 }
 
 String arduino::MbedSocketClass::macAddress() {
-  return String(getNetwork()->get_mac_address());
+  const char* mac_str = getNetwork()->get_mac_address();
+  if (!mac_str) {
+    return String("ff:ff:ff:ff:ff:ff");
+  }
+  return String(mac_str);
 }
 
 int arduino::MbedSocketClass::hostByName(const char* aHostname, IPAddress& aResult) {

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,11 @@ uint8_t* arduino::MbedSocketClass::macAddress(uint8_t* mac) {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`String arduino::MbedSocketClass::macAddress() {`
`14`		`- return String(getNetwork()->get_mac_address());`
	`14`	`+ const char* mac_str = getNetwork()->get_mac_address();`
	`15`	`+ if (!mac_str) {`
	`16`	`+ return String("ff:ff:ff:ff:ff:ff");`
	`17`	`+ }`
	`18`	`+ return String(mac_str);`
`15`	`19`	`}`
`16`	`20`
`17`	`21`	`int arduino::MbedSocketClass::hostByName(const char* aHostname, IPAddress& aResult) {`