merge

1 files changed, 11 insertions, 3 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
index 724522b75..78fba3c49 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
@@ -86,6 +86,7 @@ uint32_t    FileUploadRequestFunc(MessageContainer* requestContainer)
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
     my_free(responseContainer.data.data);
+    file_upload_request__free_unpacked(request,NULL);
     SendChars(container_buffer, container_size);
 
     return OK;
@@ -156,6 +157,7 @@ uint32_t    FileChunkUploadRequestFunc(MessageContainer* requestContainer)
     responseContainer.continuous = false;
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
+    file_chunk_upload_request__free_unpacked(request,NULL);
     my_free(responseContainer.data.data);
     SendChars(container_buffer, container_size);
 
@@ -181,6 +183,7 @@ uint32_t    ExecuteProcessRequestFunc(MessageContainer* requestContainer)
     responseContainer.continuous = false;
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
+    execute_process_request__free_unpacked(request,NULL);
     my_free(responseContainer.data.data);
     SendChars(container_buffer, container_size);
 
@@ -207,6 +210,7 @@ uint32_t    KillProcessRequestFunc(MessageContainer* requestContainer)
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
     my_free(responseContainer.data.data);
+    kill_process_request__free_unpacked(request,NULL);
     SendChars(container_buffer, container_size);
 
     return OK;
@@ -261,6 +265,7 @@ uint32_t    CreateRequestFunc(MessageContainer* requestContainer)
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
     my_free(responseContainer.data.data);
+    create_request__free_unpacked(request,NULL);
     SendChars(container_buffer, container_size);
 
     return OK;
@@ -327,6 +332,7 @@ uint32_t    DeleteRequestFunc(MessageContainer* requestContainer)
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
     my_free(responseContainer.data.data);
+    delete_request__free_unpacked(request,NULL);
     SendChars(container_buffer, container_size);
 
     return OK;
@@ -370,6 +376,7 @@ uint32_t    GetStorageInfoRequestFunc(MessageContainer* requestContainer)
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
     my_free(responseContainer.data.data);
+    get_storage_info_request__free_unpacked(request,NULL);
     SendChars(container_buffer, container_size);
 
     return OK;
@@ -392,7 +399,7 @@ uint32_t    GetFilesRequestFunc(MessageContainer* requestContainer)
 
     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)
@@ -449,11 +456,12 @@ uint32_t    GetFilesRequestFunc(MessageContainer* requestContainer)
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
     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;
 }