corrected string and char array length

homieiot · Mar 24, 2019 · 107fbdf · 107fbdf
1 parent 050cc8b
commit 107fbdf
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/Homie/Boot/BootConfig.cpp b/src/Homie/Boot/BootConfig.cpp
@@ -34,7 +34,7 @@ void BootConfig::setup() {
   WiFi.mode(WIFI_AP_STA);
 
   char apName[MAX_WIFI_SSID_LENGTH];
-  strlcpy(apName, Interface::get().brand, MAX_WIFI_SSID_LENGTH - 1 - MAX_MAC_STRING_LENGTH);
+  strlcpy(apName, Interface::get().brand, MAX_WIFI_SSID_LENGTH - 1 - (MAX_MAC_STRING_LENGTH - 1));
   strcat_P(apName, PSTR("-"));
   strcat(apName, DeviceId::get());
 

diff --git a/src/Homie/Utils/DeviceId.cpp b/src/Homie/Utils/DeviceId.cpp
@@ -7,7 +7,7 @@ char DeviceId::_deviceId[];  // need to define the static variable
 void DeviceId::generate() {
   uint8_t mac[6];
   WiFi.macAddress(mac);
-  snprintf(DeviceId::_deviceId, MAX_MAC_STRING_LENGTH+1 , "%02x%02x%02x%02x%02x%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+  snprintf(DeviceId::_deviceId, MAX_MAC_STRING_LENGTH, "%02x%02x%02x%02x%02x%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 }
 
 const char* DeviceId::get() {

diff --git a/src/Homie/Utils/DeviceId.hpp b/src/Homie/Utils/DeviceId.hpp
@@ -13,6 +13,6 @@ class DeviceId {
   static const char* get();
 
  private:
-  static char _deviceId[MAX_MAC_STRING_LENGTH + 1];
+  static char _deviceId[MAX_MAC_STRING_LENGTH];
 };
 }  // namespace HomieInternals
diff --git a/src/Homie/Utils/Helpers.cpp b/src/Homie/Utils/Helpers.cpp
@@ -55,7 +55,7 @@ bool Helpers::validateMacAddress(const char* mac) {
     }
     ++mac;
   }
-  return (i == MAX_MAC_STRING_LENGTH && s == 5);
+  return (i == MAX_MAC_LENGTH * 2 && s == 5);
 }
 
 bool Helpers::validateMd5(const char* md5) {

diff --git a/src/Homie/Utils/Validation.cpp b/src/Homie/Utils/Validation.cpp
@@ -402,5 +402,5 @@ ConfigValidationResult Validation::_validateConfigSettings(const JsonObject& obj
 //    }
 //    ++mac;
 //   }
-//   return (i == MAX_MAC_STRING_LENGTH && s == 5);
+//   return (i == MAX_MAC_LENGTH * 2 && s == 5);
 // }