From 6de96b9120ee0d1d6b83dbedffc526d61b386ac7 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Tue, 19 May 2009 20:12:20 +0000 Subject: [PATCH] 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/branches/1.4@195520 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 0509559bb3..9b05d2b3bf 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -1904,6 +1904,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; } @@ -1931,6 +1932,7 @@ static struct vm_state *get_vm_state_by_imapuser(char *user, int interactive) if (interactive) { struct vm_state *vms; + pthread_once(&ts_vmstate.once, ts_vmstate.key_init); vms = pthread_getspecific(ts_vmstate.key); return vms; } @@ -1972,6 +1974,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; } -- 2.47.2