9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

src/newconf.c: fakechannel: guard against repeated config options

Browse source 
Also correct another minor memory leak
This commit is contained in:
Aaron Jones 2018-11-26 21:22:40 +00:00
parent 9a10251fd5
commit 3c36726f83
No known key found for this signature in database
GPG key ID: 8AF0737488AB3012
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/newconf.c
View file

@ -1808,14 +1808,15 @@ conf_begin_fakechannel(struct TopConf *tc)
{ {
yy_fakechannel = rb_malloc(sizeof(struct fakechannel_entry)); yy_fakechannel = rb_malloc(sizeof(struct fakechannel_entry));
if (conf_cur_block_name != NULL)
yy_fakechannel->name = rb_strdup(conf_cur_block_name);
/* Set defaults */ /* Set defaults */
yy_fakechannel->name = NULL;
yy_fakechannel->topic = NULL; yy_fakechannel->topic = NULL;
yy_fakechannel->users_min = 50; yy_fakechannel->users_min = 50;
yy_fakechannel->users_max = 300; yy_fakechannel->users_max = 300;
if (conf_cur_block_name != NULL)
yy_fakechannel->name = rb_strdup(conf_cur_block_name);
return 0; return 0;
} }
@ -1839,6 +1840,7 @@ conf_end_fakechannel(struct TopConf *tc)
{ {
conf_report_error("Ignoring fakechannel -- users_max less than users_min."); conf_report_error("Ignoring fakechannel -- users_max less than users_min.");
rb_free(yy_fakechannel->name);
rb_free(yy_fakechannel->topic); rb_free(yy_fakechannel->topic);
rb_free(yy_fakechannel); rb_free(yy_fakechannel);
@ -1861,6 +1863,7 @@ conf_set_fakechannel_name(void *data)
if (data == NULL || yy_fakechannel == NULL) /* this shouldn't ever happen */ if (data == NULL || yy_fakechannel == NULL) /* this shouldn't ever happen */
return; return;
rb_free(yy_fakechannel->name);
yy_fakechannel->name = rb_strdup(data); yy_fakechannel->name = rb_strdup(data);
} }
@ -1870,6 +1873,7 @@ conf_set_fakechannel_topic(void *data)
if (data == NULL || yy_fakechannel == NULL) /* this shouldn't ever happen */ if (data == NULL || yy_fakechannel == NULL) /* this shouldn't ever happen */
return; return;
rb_free(yy_fakechannel->topic);
yy_fakechannel->topic = rb_strdup(data); yy_fakechannel->topic = rb_strdup(data);
} }