Merged revisions 333010 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r333010 | rmudgett | 2011-08-23 13:14:01 -0500 (Tue, 23 Aug 2011) | 12 lines
  
  Memory Leak in app_queue
  
  The patch that was committed in the 1.6.x versions of Asterisk for
  ASTERISK-15862 actually fixed two issues.  One was not applicable to 1.8
  but the other is.  queue_leak.patch fixes the portion applicable to 1.8.
  
  (closes issue ASTERISK-18265)
  Reported by: Fred Schroeder
  Patches:
        queue_leak.patch (license #5049) patch uploaded by mmichelson
  Tested by: Thomas Arimont
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@333011 65c4cc65-6c06-0410-ace0-fbb531ad65f3
10-digiumphones
Richard Mudgett 14 years ago
parent c69f237d3d
commit 1a85bf60a2

@ -1741,8 +1741,13 @@ static void init_queue(struct call_queue *q)
ast_string_field_set(q, sound_thanks, "queue-thankyou"); ast_string_field_set(q, sound_thanks, "queue-thankyou");
ast_string_field_set(q, sound_reporthold, "queue-reporthold"); ast_string_field_set(q, sound_reporthold, "queue-reporthold");
if ((q->sound_periodicannounce[0] = ast_str_create(32))) if (!q->sound_periodicannounce[0]) {
q->sound_periodicannounce[0] = ast_str_create(32);
}
if (q->sound_periodicannounce[0]) {
ast_str_set(&q->sound_periodicannounce[0], 0, "queue-periodic-announce"); ast_str_set(&q->sound_periodicannounce[0], 0, "queue-periodic-announce");
}
for (i = 1; i < MAX_PERIODIC_ANNOUNCEMENTS; i++) { for (i = 1; i < MAX_PERIODIC_ANNOUNCEMENTS; i++) {
if (q->sound_periodicannounce[i]) if (q->sound_periodicannounce[i])

Loading…
Cancel
Save