niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix leak of config data if a domain id problem leads to an initialization failure

Browse source 
Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2018-12-19 12:38:31 +01:00
parent 97c5e06b6a
commit 98c53db057
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/core/ddsc/src/dds_init.c
View file

@ -88,7 +88,7 @@ dds_init(dds_domainid_t domain)
{ {
DDS_ERROR("requested domain id %d is out of range\n", domain); DDS_ERROR("requested domain id %d is out of range\n", domain);
ret = DDS_ERRNO(DDS_RETCODE_ERROR); ret = DDS_ERRNO(DDS_RETCODE_ERROR);
goto fail_config; goto fail_config_domainid;
} }
else if (config.domainId.isdefault) else if (config.domainId.isdefault)
{ {
@ -98,7 +98,7 @@ dds_init(dds_domainid_t domain)
{ {
DDS_ERROR("requested domain id %d is inconsistent with configured value %d\n", domain, config.domainId.value); DDS_ERROR("requested domain id %d is inconsistent with configured value %d\n", domain, config.domainId.value);
ret = DDS_ERRNO(DDS_RETCODE_ERROR); ret = DDS_ERRNO(DDS_RETCODE_ERROR);
goto fail_config; goto fail_config_domainid;
} }
} }
@ -190,6 +190,7 @@ fail_servicelease_new:
thread_states_fini(); thread_states_fini();
fail_rtps_config: fail_rtps_config:
dds__builtin_fini(); dds__builtin_fini();
fail_config_domainid:
dds_global.m_default_domain = DDS_DOMAIN_DEFAULT; dds_global.m_default_domain = DDS_DOMAIN_DEFAULT;
config_fini (dds_cfgst); config_fini (dds_cfgst);
dds_cfgst = NULL; dds_cfgst = NULL;