OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

net/mld/mld_group.c: Improve error handling on a failure to allocate a new group.

This commit is contained in:
Gregory Nutt 2018-11-05 17:51:09 -06:00
parent d98262f348
commit f28ed5af03
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/mld/mld_group.c
View File

@ -133,10 +133,18 @@ FAR struct mld_group_s *mld_grpalloc(FAR struct net_driver_s *dev,
/* Initialize the group timers */ /* Initialize the group timers */
group->polldog = wd_create(); group->polldog = wd_create();
DEBUGASSERT(group->polldog); DEBUGASSERT(group->polldog != NULL);
if (group->polldog == NULL)
{
goto errout_with_sem;
}
group->v1dog = wd_create(); group->v1dog = wd_create();
DEBUGASSERT(group->v1dog); DEBUGASSERT(group->v1dog != NULL);
if (group->v1dog == NULL)
{
goto errout_with_polldog;
}
/* Save the interface index */ /* Save the interface index */
@ -152,6 +160,14 @@ FAR struct mld_group_s *mld_grpalloc(FAR struct net_driver_s *dev,
} }
return group; return group;
errout_with_polldog:
wd_delete(group->polldog);
errout_with_sem:
(void)nxsem_destroy(&group->sem);
kmm_free(group);
return NULL;
} }
/**************************************************************************** /****************************************************************************
@ -255,7 +271,7 @@ void mld_grpfree(FAR struct net_driver_s *dev, FAR struct mld_group_s *group)
/* Then release the group structure resources. */ /* Then release the group structure resources. */
grpinfo("Call sched_kfree()\n"); grpinfo("Call sched_kfree()\n");
sched_kfree(group); kmm_free(group);
} }
#endif /* CONFIG_NET_MLD */ #endif /* CONFIG_NET_MLD */