libs/rt-thread-official
libs/rt-thread-official
4
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-02-28 02:37:03 +08:00
Code Issues Releases Wiki Activity

Merge pull request #4743 from sszllzss/at_client-rt_realloc_iss

Browse Source 
[components][net][at]修改at_obj_set_urc_table函数重新分配内存可能导致内存泄漏问题
This commit is contained in:
guo 2021-07-27 09:59:56 +08:00 committed by GitHub
commit 1f15479466
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/net/at/src/at_client.c
View File

@ -9,6 +9,7 @@
* 2018-04-12 chenyong add client implement * 2018-04-12 chenyong add client implement
* 2018-08-17 chenyong multiple client support * 2018-08-17 chenyong multiple client support
* 2021-03-17 Meco Man fix a buf of leaking memory * 2021-03-17 Meco Man fix a buf of leaking memory
* 2021-07-14 Sszl fix a buf of leaking memory
*/ */
#include <at.h> #include <at.h>
@ -571,30 +572,19 @@ int at_obj_set_urc_table(at_client_t client, const struct at_urc *urc_table, rt_
} }
else else
{ {
struct at_urc_table *old_urc_table = RT_NULL; struct at_urc_table *new_urc_table = RT_NULL;
size_t old_table_size = client->urc_table_size * sizeof(struct at_urc_table);
old_urc_table = (struct at_urc_table *) rt_malloc(old_table_size);
if (old_urc_table == RT_NULL)
{
return -RT_ENOMEM;
}
rt_memcpy(old_urc_table, client->urc_table, old_table_size);
/* realloc urc table space */ /* realloc urc table space */
client->urc_table = (struct at_urc_table *) rt_realloc(client->urc_table, new_urc_table = (struct at_urc_table *) rt_realloc(client->urc_table,client->urc_table_size * sizeof(struct at_urc_table) + sizeof(struct at_urc_table));
old_table_size + sizeof(struct at_urc_table)); if (new_urc_table == RT_NULL)
if (client->urc_table == RT_NULL)
{ {
rt_free(old_urc_table);
return -RT_ENOMEM; return -RT_ENOMEM;
} }
rt_memcpy(client->urc_table, old_urc_table, old_table_size); client->urc_table = new_urc_table;
client->urc_table[client->urc_table_size].urc = urc_table; client->urc_table[client->urc_table_size].urc = urc_table;
client->urc_table[client->urc_table_size].urc_size = table_sz; client->urc_table[client->urc_table_size].urc_size = table_sz;
client->urc_table_size++; client->urc_table_size++;
rt_free(old_urc_table);
} }
return RT_EOK; return RT_EOK;