]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
LBTEL-1 Build error "array subscript is above array bounds"
authorMichael Jerris <mike@jerris.com>
Fri, 12 Dec 2008 19:45:34 +0000 (19:45 +0000)
committerMichael Jerris <mike@jerris.com>
Fri, 12 Dec 2008 19:45:34 +0000 (19:45 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10741 d0543943-73ff-0310-b7d9-9358b9ac24b2

libs/libteletone/src/libteletone_generate.c

index 1e330a90078d6ad29c133e68c9f042560cdad039..dea04b839f9e85c817b89de59b5b57e72622777e 100644 (file)
@@ -221,7 +221,7 @@ int teletone_mux_tones(teletone_generation_session_t *ts, teletone_tone_map_t *m
        wait = (ts->tmp_wait > -1) ? ts->tmp_wait : ts->wait;
 
        if (map->freqs[0] > 0) {
-               for (freqlen = 0; map->freqs[freqlen] && freqlen < TELETONE_MAX_TONES; freqlen++) {
+               for (freqlen = 0; freqlen < TELETONE_MAX_TONES && map->freqs[freqlen]; freqlen++) {
                        teletone_dds_state_set_tone(&tones[freqlen], map->freqs[freqlen], ts->rate, 0);
                        teletone_dds_state_set_tx_level(&tones[freqlen], vol);
                }
@@ -243,7 +243,7 @@ int teletone_mux_tones(teletone_generation_session_t *ts, teletone_tone_map_t *m
 
                                if (nvol <= TELETONE_VOL_DB_MAX && nvol >= TELETONE_VOL_DB_MIN) {
                                        vol = nvol;
-                                       for (j = 0; map->freqs[j] && j < TELETONE_MAX_TONES; j++) {                                     
+                                       for (j = 0; j < TELETONE_MAX_TONES && map->freqs[j]; j++) {                                     
                                                teletone_dds_state_set_tx_level(&tones[j], vol);
                                        }
                                        dc = 0;