Update strncpy sizeof's

Author: PaulZC

Firmware/RTK_Surveyor/Bluetooth.ino

@@ -149,9 +149,9 @@ void bluetoothStart()
   {
     char stateName[11];
     if (systemState >= STATE_ROVER_NOT_STARTED && systemState <= STATE_ROVER_RTK_FIX)
-      strncpy(stateName, "Rover-", 10);
+      strncpy(stateName, "Rover-", sizeof(stateName) - 1);
     else if (systemState >= STATE_BASE_NOT_STARTED && systemState <= STATE_BASE_FIXED_TRANSMITTING)
-      strncpy(stateName, "Base-", 10);
+      strncpy(stateName, "Base-", sizeof(stateName) - 1);
 
     snprintf(deviceName, sizeof(deviceName), "%s %s%02X%02X", platformPrefix, stateName, btMACAddress[4], btMACAddress[5]);
 

Firmware/RTK_Surveyor/Display.ino

@@ -2465,7 +2465,7 @@ void displayMessage(const char* message, uint16_t displayTime)
 
     //Count words based on spaces
     uint8_t wordCount = 0;
-    strncpy(temp, message, 20); //strtok modifies the message so make copy
+    strncpy(temp, message, sizeof(temp) - 1); //strtok modifies the message so make copy
     char * token = strtok(temp, " ");
     while (token != nullptr)
     {
@@ -2480,7 +2480,7 @@ void displayMessage(const char* message, uint16_t displayTime)
 
     //drawFrame();
 
-    strncpy(temp, message, 20);
+    strncpy(temp, message, sizeof(temp) - 1);
     token = strtok(temp, " ");
     while (token != nullptr)
     {

Firmware/RTK_Surveyor/NtripClient.ino

@@ -88,7 +88,7 @@ bool ntripClientConnect()
 
   //Remove any http:// or https:// prefix from host name
   char hostname[51];
-  strncpy(hostname, settings.ntripClient_CasterHost, 50); //strtok modifies string to be parsed so we create a copy
+  strncpy(hostname, settings.ntripClient_CasterHost, sizeof(hostname) - 1); //strtok modifies string to be parsed so we create a copy
   char *token = strtok(hostname, "//");
   if (token != nullptr)
   {

Firmware/RTK_Surveyor/NtripServer.ino

@@ -87,7 +87,7 @@ bool ntripServerConnectCaster()
 
   //Remove any http:// or https:// prefix from host name
   char hostname[51];
-  strncpy(hostname, settings.ntripServer_CasterHost, 50); //strtok modifies string to be parsed so we create a copy
+  strncpy(hostname, settings.ntripServer_CasterHost, sizeof(hostname) - 1); //strtok modifies string to be parsed so we create a copy
   char *token = strtok(hostname, "//");
   if (token != nullptr)
   {

Firmware/RTK_Surveyor/menuGNSS.ino

@@ -217,7 +217,7 @@ void menuGNSS()
   //Error check for RTK2Go without email in user name
   //First force tolower the host name
   char lowerHost[51];
-  strncpy(lowerHost, settings.ntripClient_CasterHost, 50);
+  strncpy(lowerHost, settings.ntripClient_CasterHost, sizeof(lowerHost) - 1);
   for (int x = 0 ; x < 50 ; x++)
   {
     if (lowerHost[x] == '\0') break;