[asterisk-commits] russell: branch group/vldtmf_fixup r51201 - in /team/group/vldtmf_fixup: ./ a...

[asterisk-commits at lists.digium.com]

Author: russell
Date: Wed Jan 17 15:30:00 2007
New Revision: 51201

URL: http://svn.digium.com/view/asterisk?view=rev&rev=51201
Log:
Merged revisions 51186,51195,51198 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r51186 | qwell | 2007-01-17 11:36:53 -0600 (Wed, 17 Jan 2007) | 2 lines

re-add "password" for realtime voicemail

................
r51195 | tilghman | 2007-01-17 14:56:15 -0600 (Wed, 17 Jan 2007) | 12 lines

Merged revisions 51194 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r51194 | tilghman | 2007-01-17 14:52:21 -0600 (Wed, 17 Jan 2007) | 4 lines

When ast_strip_quoted was called with a zero-length string, it would treat a
NULL as if it were the quoting character (and would thus return the string
in memory immediately following the passed-in string).

........

................
r51198 | russell | 2007-01-17 15:18:35 -0600 (Wed, 17 Jan 2007) | 11 lines

Merged revisions 51197 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r51197 | russell | 2007-01-17 15:17:21 -0600 (Wed, 17 Jan 2007) | 3 lines

Move the check for a failure of ast_channel_alloc() to before locking the
pvt structure again.  Otherwise, on a failure, this will cause a deadlock.

........

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

Modified:
    team/group/vldtmf_fixup/   (props changed)
    team/group/vldtmf_fixup/apps/app_voicemail.c
    team/group/vldtmf_fixup/channels/chan_sip.c
    team/group/vldtmf_fixup/main/utils.c

Propchange: team/group/vldtmf_fixup/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/group/vldtmf_fixup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan 17 15:30:00 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-51183
+/branches/1.4:1-51200

Modified: team/group/vldtmf_fixup/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf_fixup/apps/app_voicemail.c?view=diff&rev=51201&r1=51200&r2=51201
==============================================================================
--- team/group/vldtmf_fixup/apps/app_voicemail.c (original)
+++ team/group/vldtmf_fixup/apps/app_voicemail.c Wed Jan 17 15:30:00 2007
@@ -659,7 +659,7 @@
 	while (tmp) {
 		if (!strcasecmp(tmp->name, "vmpassword")) {
 			ast_copy_string(retval->password, tmp->value, sizeof(retval->password));
-		} else if (!strcasecmp(tmp->name, "secret")) { /* don't overwrite vmpassword if it exists */
+		} else if (!strcasecmp(tmp->name, "secret") || !strcasecmp(tmp->name, "password")) { /* don't overwrite vmpassword if it exists */
 			if (ast_strlen_zero(retval->password))
 				ast_copy_string(retval->password, tmp->value, sizeof(retval->password));
 		} else if (!strcasecmp(tmp->name, "uniqueid")) {

Modified: team/group/vldtmf_fixup/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf_fixup/channels/chan_sip.c?view=diff&rev=51201&r1=51200&r2=51201
==============================================================================
--- team/group/vldtmf_fixup/channels/chan_sip.c (original)
+++ team/group/vldtmf_fixup/channels/chan_sip.c Wed Jan 17 15:30:00 2007
@@ -3759,11 +3759,11 @@
 		tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, "SIP/%s-%08x", my_name, (int)(long) i);
 
 	}
-	ast_mutex_lock(&i->lock);
 	if (!tmp) {
 		ast_log(LOG_WARNING, "Unable to allocate AST channel structure for SIP channel\n");
 		return NULL;
 	}
+	ast_mutex_lock(&i->lock);
 
 	if (ast_test_flag(&p->flags[0], SIP_DTMF) == SIP_DTMF_INFO)
 		tmp->tech = &sip_tech_info;

Modified: team/group/vldtmf_fixup/main/utils.c
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf_fixup/main/utils.c?view=diff&rev=51201&r1=51200&r2=51201
==============================================================================
--- team/group/vldtmf_fixup/main/utils.c (original)
+++ team/group/vldtmf_fixup/main/utils.c Wed Jan 17 15:30:00 2007
@@ -638,7 +638,7 @@
 	char *q;
 
 	s = ast_strip(s);
-	if ((q = strchr(beg_quotes, *s))) {
+	if ((q = strchr(beg_quotes, *s)) && *q != '\0') {
 		e = s + strlen(s) - 1;
 		if (*e == *(end_quotes + (q - beg_quotes))) {
 			s++;