[svn-commits] rmudgett: branch 10 r333011 - in /branches/10: ./ apps/app_queue.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Aug 23 13:15:49 2011
New Revision: 333011

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=333011
Log:
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
........

Modified:
    branches/10/   (props changed)
    branches/10/apps/app_queue.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/apps/app_queue.c?view=diff&rev=333011&r1=333010&r2=333011
==============================================================================
--- branches/10/apps/app_queue.c (original)
+++ branches/10/apps/app_queue.c Tue Aug 23 13:15:49 2011
@@ -1741,8 +1741,13 @@
 	ast_string_field_set(q, sound_thanks, "queue-thankyou");
 	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");
+	}
 
 	for (i = 1; i < MAX_PERIODIC_ANNOUNCEMENTS; i++) {
 		if (q->sound_periodicannounce[i])