kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-17 07:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 39081 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r39081 | russell | 2006-08-06 21:28:29 -0400 (Sun, 06 Aug 2006) | 7 lines

Fix a crash reported to me by hads on IRC.  This crash would occur with the use
of the "distinctiveringaftercid" option.  Also, on this user's system, the crash
would only occur when built without optimizations.  This is because the bug is
that the code would write past the end of an array that was allocated on the
stack, and the structure of the stack is different with or without optimizations
enabled.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@39082 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-08-07 01:32:51 +00:00
parent 954ed66a0a
commit 12b3d4a49e
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
channels/chan_zap.c
View File

@@ -765,8 +765,6 @@ static struct zt_ring_cadence cadences[NUM_CADENCE_MAX] = {
{ { 1000, 500, 2500, 5000 } }, /*!< Long ring */
};
int receivedRingT; /*!< Used to find out what ringtone we are on */
/*! \brief cidrings says in which pause to transmit the cid information, where the first pause
* is 1, the second pause is 2 and so on.
*/
@@ -6135,9 +6133,8 @@ static void *ss_thread(void *data)
len = 0;
distMatches = 0;
/* Clear the current ring data array so we dont have old data in it. */
for (receivedRingT = 0; receivedRingT < 3; receivedRingT++) {
for (receivedRingT = 0; receivedRingT < (sizeof(curRingData) / sizeof(curRingData[0])); receivedRingT++)
curRingData[receivedRingT] = 0;
}
receivedRingT = 0;
counter = 0;
counter1 = 0;
@@ -6165,8 +6162,10 @@ static void *ss_thread(void *data)
if (p->ringt < p->ringt_base/2)
break;
++receivedRingT; /* Increment the ringT counter so we can match it against
values in zapata.conf for distinctive ring */
/* Increment the ringT counter so we can match it against
values in zapata.conf for distinctive ring */
if (++receivedRingT == (sizeof(curRingData) / sizeof(curRingData[0])))
break;
} else if (i & ZT_IOMUX_READ) {
res = read(p->subs[index].zfd, buf, sizeof(buf));
if (res < 0) {
@@ -6237,9 +6236,8 @@ static void *ss_thread(void *data)
len = 0;
distMatches = 0;
/* Clear the current ring data array so we dont have old data in it. */
for (receivedRingT = 0; receivedRingT < 3; receivedRingT++) {
for (receivedRingT = 0; receivedRingT < (sizeof(curRingData) / sizeof(curRingData[0])); receivedRingT++)
curRingData[receivedRingT] = 0;
}
receivedRingT = 0;
counter = 0;
counter1 = 0;
@@ -6269,8 +6267,10 @@ static void *ss_thread(void *data)
if (p->ringt < p->ringt_base/2)
break;
++receivedRingT; /* Increment the ringT counter so we can match it against
values in zapata.conf for distinctive ring */
/* Increment the ringT counter so we can match it against
values in zapata.conf for distinctive ring */
if (++receivedRingT == (sizeof(curRingData) / sizeof(curRingData[0])))
break;
} else if (i & ZT_IOMUX_READ) {
res = read(p->subs[index].zfd, buf, sizeof(buf));
if (res < 0) {