status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix memory leak when realloc fails

This commit is contained in:
Chocobo1 2016-01-04 11:51:49 +08:00
parent e076899a37
commit 948b883966
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
miniupnpd/ipf/ipfrdr.c
View File

@ -723,7 +723,7 @@ unsigned short *
get_portmappings_in_range(unsigned short startport, unsigned short endport,
int proto, unsigned int * number)
{
unsigned short * array;
unsigned short *array, *array2;
unsigned int capacity;
unsigned short eport;
ipfgeniter_t iter;
@ -742,7 +742,7 @@ get_portmappings_in_range(unsigned short startport, unsigned short endport,
syslog(LOG_ERR, "get_portmappings_in_range() : calloc error");
return NULL;
}
memset(&obj, 0, sizeof(obj));
obj.ipfo_rev = IPFILTER_VERSION;
obj.ipfo_ptr = &iter;
@ -761,10 +761,10 @@ get_portmappings_in_range(unsigned short startport, unsigned short endport,
"get_portmappings_in_range");
break;
}
if (strcmp(ipn.in_tag.ipt_tag, group_name) != 0)
continue;
#if IPFILTER_VERSION >= 5000000
eport = ntohs(ipn.in_dpmin);
if( (eport == ntohs(ipn.in_dpmax))
@ -781,13 +781,15 @@ get_portmappings_in_range(unsigned short startport, unsigned short endport,
{
/* need to increase the capacity of the array */
capacity += 128;
array = realloc(array, sizeof(unsigned short)*capacity);
if(!array)
array2 = realloc(array, sizeof(unsigned short)*capacity);
if(!array2)
{
syslog(LOG_ERR, "get_portmappings_in_range() : realloc(%lu) error", sizeof(unsigned short)*capacity);
*number = 0;
free(array);
return NULL;
}
array = array2;
}
array[*number] = eport;
(*number)++;

8
miniupnpd/ipfw/ipfwrdr.c
View File

@ -430,7 +430,7 @@ get_portmappings_in_range(unsigned short startport,
int proto,
unsigned int * number)
{
unsigned short * array = NULL;
unsigned short *array = NULL, *array2 = NULL;
unsigned int capacity = 128;
int i, count_rules, total_rules = 0;
struct ip_fw * rules = NULL;
@ -459,12 +459,14 @@ get_portmappings_in_range(unsigned short startport,
&& eport <= endport) {
if(*number >= capacity) {
capacity += 128;
array = realloc(array, sizeof(unsigned short)*capacity);
if(!array) {
array2 = realloc(array, sizeof(unsigned short)*capacity);
if(!array2) {
syslog(LOG_ERR, "get_portmappings_in_range() : realloc(%lu) error", sizeof(unsigned short)*capacity);
*number = 0;
free(array);
goto error;
}
array = array2;
}
array[*number] = eport;
(*number)++;