kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

freetdm: Try to be more foolproof when creating an iterator for an empty span 

to avoid triggering asserts later
This commit is contained in:
Moises Silva 2012-07-06 18:43:03 -04:00
parent c6fc4a2774
commit c81e20475f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/freetdm/src/ftdm_io.c
View File

@ -4181,6 +4181,9 @@ FT_DECLARE(ftdm_iterator_t *) ftdm_get_iterator(ftdm_iterator_type_t type, ftdm_
FT_DECLARE(ftdm_iterator_t *) ftdm_span_get_chan_iterator(const ftdm_span_t *span, ftdm_iterator_t *iter) FT_DECLARE(ftdm_iterator_t *) ftdm_span_get_chan_iterator(const ftdm_span_t *span, ftdm_iterator_t *iter)
{ {
if (!span->chan_count) {
return NULL;
}
if (!(iter = ftdm_get_iterator(FTDM_ITERATOR_CHANS, iter))) { if (!(iter = ftdm_get_iterator(FTDM_ITERATOR_CHANS, iter))) {
return NULL; return NULL;
} }
@ -4671,7 +4674,7 @@ static ftdm_status_t load_config(void)
*name++ = '\0'; *name++ = '\0';
} }
/* Verify is trunk_type was specified for previous span */ /* Verify if trunk_type was specified for previous span */
if (span && span->trunk_type == FTDM_TRUNK_NONE) { if (span && span->trunk_type == FTDM_TRUNK_NONE) {
ftdm_log(FTDM_LOG_ERROR, "trunk_type not specified for span %d (%s)\n", span->span_id, span->name); ftdm_log(FTDM_LOG_ERROR, "trunk_type not specified for span %d (%s)\n", span->span_id, span->name);
ret = FTDM_FAIL; ret = FTDM_FAIL;