[svn-commits] mmichelson: branch 1.6.0 r120515 - in /branches/1.6.0: ./ apps/app_queue.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Jun  4 17:08:09 2008
New Revision: 120515

URL: http://svn.digium.com/view/asterisk?view=rev&rev=120515
Log:
Merged revisions 120514 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r120514 | mmichelson | 2008-06-04 17:07:37 -0500 (Wed, 04 Jun 2008) | 14 lines

Merged revisions 120513 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r120513 | mmichelson | 2008-06-04 17:05:33 -0500 (Wed, 04 Jun 2008) | 6 lines

Make sure that the string we set will survive the unref of
the queue member.

Thanks to Russell, who pointed this out.


........

................

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

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_queue.c?view=diff&rev=120515&r1=120514&r2=120515
==============================================================================
--- branches/1.6.0/apps/app_queue.c (original)
+++ branches/1.6.0/apps/app_queue.c Wed Jun  4 17:08:09 2008
@@ -5894,10 +5894,10 @@
 			if (!strncasecmp(word, m->membername, wordlen) && ++which > state) {
 				char *tmp;
 				ao2_unlock(q);
-				tmp = m->interface;
+				tmp = ast_strdup(m->interface);
 				ao2_ref(m, -1);
 				queue_unref(q);
-				return ast_strdup(tmp);
+				return tmp;
 			}
 			ao2_ref(m, -1);
 		}