Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-08-09 20:24:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[all] general: fix possible memory leaks with realloc usage

Browse Source
This commit is contained in:
Geoffrey McRae
2025-03-09 02:56:20 +11:00
parent 5382a94945
commit a421329d9a
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/src/option.c
View File

@@ -131,16 +131,16 @@ bool option_register(struct Option options[])
for(int i = 0; options[i].type != OPTION_TYPE_NONE; ++i)
++new;
state.options = realloc(
void * tmp = realloc(
state.options,
sizeof(*state.options) * (state.oCount + new)
);
if (!state.options)
if (!tmp)
{
DEBUG_ERROR("out of memory");
return false;
}
state.options = tmp;
for(int i = 0; options[i].type != OPTION_TYPE_NONE; ++i)
{
@@ -229,15 +229,16 @@ bool option_register(struct Option options[])
continue;
found = true;
group->options = realloc(
void * tmp = realloc(
group->options,
sizeof(*group->options) * (group->count + 1)
);
if (!group->options)
if (!tmp)
{
DEBUG_ERROR("out of memory");
return false;
}
group->options = tmp;
group->options[group->count] = o;
int len = strlen(o->name);
@@ -250,15 +251,16 @@ bool option_register(struct Option options[])
if (!found)
{
state.groups = realloc(
void * new = realloc(
state.groups,
sizeof(*state.groups) * (state.gCount + 1)
);
if (!state.groups)
if (!new)
{
DEBUG_ERROR("out of memory");
return false;
}
state.groups = new;
struct OptionGroup * group = &state.groups[state.gCount];
++state.gCount;

9
common/src/platform/linux/crash.c
View File

@@ -164,7 +164,14 @@ static int dl_iterate_phdr_callback(struct dl_phdr_info * info, size_t size, voi
ttl += hdr.p_memsz;
}
crash.ranges = realloc(crash.ranges, sizeof(*crash.ranges) * (crash.rangeCount + 1));
void * tmp = realloc(crash.ranges,
sizeof(*crash.ranges) * (crash.rangeCount + 1));
if (!tmp)
{
DEBUG_ERROR("out of memory");
return 1;
}
crash.ranges = tmp;
crash.ranges[crash.rangeCount].start = info->dlpi_addr;
crash.ranges[crash.rangeCount].end = info->dlpi_addr + ttl;
++crash.rangeCount;