Merge branch 'develop' into feature/MCU8MASS-1842-curl-response-code

Author: M65649

src/http_client.cpp

@@ -321,33 +321,27 @@ HttpResponse HttpClientClass::post(const char* endpoint,
 
     switch (content_type) {
     case CONTENT_TYPE_APPLICATION_X_WWW_FORM_URLENCODED:
-        strncpy_P(content_type_buffer,
-                  HTTP_CONTENT_TYPE_APPLICATION_X_WWW_FORM_URLENCODED,
-                  sizeof(content_type_buffer));
+        strcpy_P(content_type_buffer,
+                 HTTP_CONTENT_TYPE_APPLICATION_X_WWW_FORM_URLENCODED);
         break;
 
     case CONTENT_TYPE_APPLICATION_OCTET_STREAM:
-        strncpy_P(content_type_buffer,
-                  HTTP_CONTENT_TYPE_APPLICATION_OCTET_STREAM,
-                  sizeof(content_type_buffer));
+        strcpy_P(content_type_buffer,
+                 HTTP_CONTENT_TYPE_APPLICATION_OCTET_STREAM);
         break;
 
     case CONTENT_TYPE_MULTIPART_FORM_DATA:
-        strncpy_P(content_type_buffer,
-                  HTTP_CONTENT_TYPE_APPLICATION_MULTIPART_FORM_DATA,
-                  sizeof(content_type_buffer));
+        strcpy_P(content_type_buffer,
+                 HTTP_CONTENT_TYPE_APPLICATION_MULTIPART_FORM_DATA);
         break;
 
     case CONTENT_TYPE_APPLICATION_JSON:
-        strncpy_P(content_type_buffer,
-                  HTTP_CONTENT_TYPE_APPLICATION_APPLICATION_JSON,
-                  sizeof(content_type_buffer));
+        strcpy_P(content_type_buffer,
+                 HTTP_CONTENT_TYPE_APPLICATION_APPLICATION_JSON);
         break;
 
     default:
-        strncpy_P(content_type_buffer,
-                  HTTP_CONTENT_TYPE_TEXT_PLAIN,
-                  sizeof(content_type_buffer));
+        strcpy_P(content_type_buffer, HTTP_CONTENT_TYPE_TEXT_PLAIN);
         break;
     }
 

src/mqtt_client.cpp

@@ -120,8 +120,13 @@ static void internalDisconnectCallback(char* urc_data) {
 
 static void internalOnReceiveCallback(char* urc_data) {
 
+    // The incoming urc_data is a buffer of maximum URC_DATA_BUFFER_SIZE (from
+    // the SequansController)
     strncpy(urc_buffer, urc_data, URC_DATA_BUFFER_SIZE);
 
+    // Safe guard ourselves
+    urc_buffer[URC_DATA_BUFFER_SIZE] = '\0';
+
     const bool got_topic = SequansController.extractValueFromCommandResponse(
         urc_buffer,
         1,

src/sequans_controller.cpp

@@ -903,13 +903,11 @@ bool SequansControllerClass::extractValueFromCommandResponse(
     const size_t destination_buffer_size,
     const char start_character) {
 
-    // We need a copy in order to not modify the original
-    size_t rcp_size = strlen(response) + 1;
-    char response_copy[rcp_size];
-    strncpy(response_copy, response, rcp_size);
-
-    // Safe guard ourselves
-    response_copy[rcp_size - 1] = '\0';
+    // We need a copy in order to not modify the original. This copy will
+    // include the null termination.
+    const size_t response_size        = strlen(response) + 1;
+    char response_copy[response_size] = "";
+    strcpy(response_copy, response);
 
     char* data;
 
@@ -1034,13 +1032,9 @@ bool SequansControllerClass::registerCallback(const char* urc_identifier,
         if (urcs[i].identifier_length == 0) {
 
             if (is_flash_string) {
-                strncpy_P((char*)urcs[i].identifier,
-                          urc_identifier,
-                          URC_IDENTIFIER_BUFFER_SIZE);
+                strcpy_P((char*)urcs[i].identifier, urc_identifier);
             } else {
-                strncpy((char*)urcs[i].identifier,
-                        urc_identifier,
-                        URC_IDENTIFIER_BUFFER_SIZE);
+                strcpy((char*)urcs[i].identifier, urc_identifier);
             }
 
             urcs[i].identifier_length = urc_identifier_length;