]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
freetdm: Try to be more foolproof when creating an iterator for an empty span
authorMoises Silva <moy@sangoma.com>
Fri, 6 Jul 2012 22:43:03 +0000 (18:43 -0400)
committerMoises Silva <moy@sangoma.com>
Fri, 6 Jul 2012 22:43:03 +0000 (18:43 -0400)
         to avoid triggering asserts later

libs/freetdm/src/ftdm_io.c

index b8bee670a49bc794ba36a7ef73f2bef26b4bae61..ab015b98ff48351e4df7ef951455dbb5141df5b1 100644 (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)
 {
+       if (!span->chan_count) {
+               return NULL;
+       }
        if (!(iter = ftdm_get_iterator(FTDM_ITERATOR_CHANS, iter))) {
                return NULL;
        }
@@ -4671,7 +4674,7 @@ static ftdm_status_t load_config(void)
                                        *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) {
                                        ftdm_log(FTDM_LOG_ERROR, "trunk_type not specified for span %d (%s)\n", span->span_id, span->name);
                                        ret = FTDM_FAIL;