aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2011-01-07 20:53:45 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2011-01-07 20:53:45 +0000
commit9dcc6c031edc719c4b4ed927936b4b2b26637366 (patch)
tree184e51823747da006292fd839ca2add4c105abfa /apps
parent2f959d08f3f03487ce8cf6242c111105347a0350 (diff)
Merged revisions 301090 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r301090 | qwell | 2011-01-07 14:53:02 -0600 (Fri, 07 Jan 2011) | 15 lines Merged revisions 301089 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r301089 | qwell | 2011-01-07 14:52:00 -0600 (Fri, 07 Jan 2011) | 8 lines Initialize useropts/adminopts in case there is no column in the realtime DB. (closes issue #18182) Reported by: dimas Patches: v1-18182.patch uploaded by dimas (license 88) Tested by: dimas ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@301091 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_meetme.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 234ed58ca..506877122 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -3839,8 +3839,8 @@ static struct ast_conference *find_conf_realtime(struct ast_channel *chan, char
char eatime[32] = "";
char bookid[51] = "";
char recordingtmp[AST_MAX_EXTENSION] = "";
- char useropts[OPTIONS_LEN + 1]; /* Used for RealTime conferences */
- char adminopts[OPTIONS_LEN + 1];
+ char useropts[OPTIONS_LEN + 1] = ""; /* Used for RealTime conferences */
+ char adminopts[OPTIONS_LEN + 1] = "";
struct ast_tm tm, etm;
struct timeval endtime = { .tv_sec = 0 };
const char *var2;