diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-19 20:18:11 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-19 20:18:11 +0000 |
| commit | 0aef41ec2a6d56165b01a60ef5e4c139aad6b9dd (patch) | |
| tree | 124f48b1445df7254b6bdd9a05515dd4956a3161 /apps | |
| parent | 5ccbe52c7733b2d3addde7d7285642367adf45c2 (diff) | |
Merged revisions 195521 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r195521 | tilghman | 2009-05-19 15:16:01 -0500 (Tue, 19 May 2009) | 14 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@195526 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_voicemail.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index f30d802c5..e2652246a 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -2445,6 +2445,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; } @@ -2472,6 +2473,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; } @@ -2507,6 +2509,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; } |