From c1cb7b078e408217828d1f3e39ab0ae128e39cb7 Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Tue, 19 May 2009 20:16:01 +0000
Subject: [PATCH] Merged revisions 195520 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r195520 | tilghman | 2009-05-19 15:12:20 -0500 (Tue, 19 May 2009) | 7 lines
Ensure thread keys are initialized before attempting to access them.
(closes issue #14889)
Reported by: jaroth
Patches:
app_voicemail.c.patch uploaded by msirota (license 758)
Tested by: msirota, BlargMaN
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@195521 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_voicemail.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index cd556f6157..07bd8aa196 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -2571,6 +2571,7 @@ static struct vm_state *create_vm_state_from_user(struct ast_vm_user *vmu)
{
struct vm_state *vms_p;
+ pthread_once(&ts_vmstate.once, ts_vmstate.key_init);
if ((vms_p = pthread_getspecific(ts_vmstate.key)) && !strcmp(vms_p->imapuser, vmu->imapuser) && !strcmp(vms_p->username, vmu->mailbox)) {
return vms_p;
}
@@ -2598,6 +2599,7 @@ static struct vm_state *get_vm_state_by_imapuser(const char *user, int interacti
if (interactive) {
struct vm_state *vms;
+ pthread_once(&ts_vmstate.once, ts_vmstate.key_init);
vms = pthread_getspecific(ts_vmstate.key);
return vms;
}
@@ -2633,6 +2635,7 @@ static struct vm_state *get_vm_state_by_mailbox(const char *mailbox, const char
if (interactive) {
struct vm_state *vms;
+ pthread_once(&ts_vmstate.once, ts_vmstate.key_init);
vms = pthread_getspecific(ts_vmstate.key);
return vms;
}
--
GitLab