From 4779fe4b337598c14a1d38c47092ec42bfb130ce Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Mon, 5 Nov 2018 16:15:56 +0200 Subject: replace malloc and free to my_malloc and my_free in all source but stubs folder. some fixes to the job stub --- .../Embedded/Common/SWUpdate/FileSystem.c | 35 +++++++++++----------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c') diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c index 6324c904e..ec079ff74 100644 --- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c +++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c @@ -83,9 +83,9 @@ 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); SendChars(container_buffer, container_size); return OK; @@ -154,9 +154,9 @@ 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); + my_free(responseContainer.data.data); SendChars(container_buffer, container_size); return OK; @@ -179,9 +179,9 @@ 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); + my_free(responseContainer.data.data); SendChars(container_buffer, container_size); return OK; @@ -204,9 +204,9 @@ 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); SendChars(container_buffer, container_size); return OK; @@ -258,9 +258,9 @@ 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); SendChars(container_buffer, container_size); return OK; @@ -324,9 +324,9 @@ 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); SendChars(container_buffer, container_size); return OK; @@ -367,9 +367,9 @@ 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); SendChars(container_buffer, container_size); return OK; @@ -390,7 +390,7 @@ 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]; Fresult = f_stat(request->path,fno[0]); if (Fresult == FR_OK) @@ -441,9 +441,10 @@ 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); SendChars(container_buffer, container_size); return OK; -- cgit v1.3.1