Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 29 insertions, 20 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
index de4f0937a..78fba3c49 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
@@ -83,9 +83,10 @@ uint32_t    FileUploadRequestFunc(MessageContainer* requestContainer)
         responseContainer.errormessage = "JOb Active or incorrect parameters";
     }
     responseContainer.continuous = false;
-    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+    uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
-    free(responseContainer.data.data);
+    my_free(responseContainer.data.data);
+    file_upload_request__free_unpacked(request,NULL);
     SendChars(container_buffer, container_size);
 
     return OK;
@@ -154,9 +155,10 @@ uint32_t    FileChunkUploadRequestFunc(MessageContainer* requestContainer)
         responseContainer.errormessage = "JOb Active or incorrect parameters";
     }
     responseContainer.continuous = false;
-    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+    uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
-    free(responseContainer.data.data);
+    file_chunk_upload_request__free_unpacked(request,NULL);
+    my_free(responseContainer.data.data);
     SendChars(container_buffer, container_size);
 
     return OK;
@@ -179,9 +181,10 @@ uint32_t    ExecuteProcessRequestFunc(MessageContainer* requestContainer)
         responseContainer.errormessage = "JOb Active or incorrect parameters";
     }
     responseContainer.continuous = false;
-    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+    uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
-    free(responseContainer.data.data);
+    execute_process_request__free_unpacked(request,NULL);
+    my_free(responseContainer.data.data);
     SendChars(container_buffer, container_size);
 
     return OK;
@@ -204,9 +207,10 @@ uint32_t    KillProcessRequestFunc(MessageContainer* requestContainer)
         responseContainer.errormessage = "JOb Active or incorrect parameters";
     }
     responseContainer.continuous = false;
-    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+    uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
-    free(responseContainer.data.data);
+    my_free(responseContainer.data.data);
+    kill_process_request__free_unpacked(request,NULL);
     SendChars(container_buffer, container_size);
 
     return OK;
@@ -258,9 +262,10 @@ uint32_t    CreateRequestFunc(MessageContainer* requestContainer)
         responseContainer.errormessage = ErrorMsg;
     }
     responseContainer.continuous = false;
-    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+    uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
-    free(responseContainer.data.data);
+    my_free(responseContainer.data.data);
+    create_request__free_unpacked(request,NULL);
     SendChars(container_buffer, container_size);
 
     return OK;
@@ -324,9 +329,10 @@ uint32_t    DeleteRequestFunc(MessageContainer* requestContainer)
         responseContainer.errormessage = "JOb Active or incorrect parameters";
     }
     responseContainer.continuous = false;
-    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+    uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
-    free(responseContainer.data.data);
+    my_free(responseContainer.data.data);
+    delete_request__free_unpacked(request,NULL);
     SendChars(container_buffer, container_size);
 
     return OK;
@@ -367,9 +373,10 @@ uint32_t    GetStorageInfoRequestFunc(MessageContainer* requestContainer)
         responseContainer.errormessage = "JOb Active or incorrect parameters";
     }
     responseContainer.continuous = false;
-    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+    uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
-    free(responseContainer.data.data);
+    my_free(responseContainer.data.data);
+    get_storage_info_request__free_unpacked(request,NULL);
     SendChars(container_buffer, container_size);
 
     return OK;
@@ -390,9 +397,9 @@ uint32_t    GetFilesRequestFunc(MessageContainer* requestContainer)
     int NumOfFiles = 0;
     FRESULT Fresult = FR_OK;
 
-    FileInfo **FilesInfo = (FileInfo**)malloc(sizeof(FileInfo *)*(MAX_NUM_OF_FILES));
+    FileInfo **FilesInfo = (FileInfo**)my_malloc(sizeof(FileInfo *)*(MAX_NUM_OF_FILES));
     FileInfo Data[MAX_NUM_OF_FILES];
-    fno[0] = malloc(sizeof(FILINFO));
+    fno[0] = my_malloc(sizeof(FILINFO));
 	memset (fno[0],0,sizeof(FILINFO));
     Fresult = f_stat(request->path,fno[0]);
     if (Fresult == FR_OK)
@@ -406,7 +413,7 @@ uint32_t    GetFilesRequestFunc(MessageContainer* requestContainer)
              {
                  for (NumOfFiles = 1;NumOfFiles < MAX_NUM_OF_FILES;NumOfFiles++)
                  {
-                     fno[NumOfFiles] = malloc(sizeof(FILINFO));
+                     fno[NumOfFiles] = my_malloc(sizeof(FILINFO));
 				     memset (fno[NumOfFiles],0,sizeof(FILINFO));
                      Fresult = f_readdir(&dir, &fno[NumOfFiles]);                   /* Read a directory item */
                      if (Fresult == FR_OK)
@@ -445,14 +452,16 @@ uint32_t    GetFilesRequestFunc(MessageContainer* requestContainer)
         responseContainer.errormessage = "JOb Active or incorrect parameters";
     }
     responseContainer.continuous = false;
-    uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+    uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
-    free(responseContainer.data.data);
+    my_free(responseContainer.data.data);
+    my_free(FilesInfo);
+    get_files_request__free_unpacked(request,NULL);
     SendChars(container_buffer, container_size);
     for (NumOfFiles = 0;NumOfFiles < MAX_NUM_OF_FILES;NumOfFiles++)
     {
         if (fno[NumOfFiles])
-               free (fno[NumOfFiles]);
+               my_free (fno[NumOfFiles]);
     }
     return OK;
 }