sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

app_morsecode: Fix deadlock 

Fixes a deadlock in app_morsecode caused by locking
the channel twice when reading variables from the
channel. The duplicate lock is simply removed.

ASTERISK-29744 #close

Change-Id: I204000701f123361d7f85e0498fedc90243c75e4
This commit is contained in:
Naveen Albert 2021-11-15 19:02:40 +00:00 committed by Kevin Harwell
parent ac2c984f22
commit a9e2d9b5f1
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/app_morsecode.c
View File

@ -197,14 +197,12 @@ static int morsecode_exec(struct ast_channel *chan, const char *data)
}
/* Use variable MORSETONE, if set (else 800) */
ast_channel_lock(chan);
tonec = pbx_builtin_getvar_helper(chan, "MORSETONE");
if (ast_strlen_zero(tonec) || (sscanf(tonec, "%30d", &tone) != 1)) {
tone = 800;
}
/* Use variable MORSESPACETONE, if set (else 0) */
toneb = pbx_builtin_getvar_helper(chan, "MORSESPACETONE");
if (ast_strlen_zero(toneb) || (sscanf(toneb, "%30d", &toneoff) != 1)) {
toneoff = 0;
@ -216,8 +214,8 @@ static int morsecode_exec(struct ast_channel *chan, const char *data)
codetype = "INTERNATIONAL";
}
ast_channel_unlock(chan);
if (!strcmp(codetype, "AMERICAN")) {
ast_channel_unlock(chan);
for (digit = data; *digit; digit++) {
const char *dahdit;
digit2 = *digit;
@ -252,7 +250,6 @@ static int morsecode_exec(struct ast_channel *chan, const char *data)
break;
}
} else { /* International */
ast_channel_unlock(chan);
for (digit = data; *digit; digit++) {
const char *dahdit;
digit2 = *digit;