Merged revisions 301090 via svnmerge from
authorJason Parker <jparker@digium.com>
Fri, 7 Jan 2011 20:53:45 +0000 (20:53 +0000)
committerJason Parker <jparker@digium.com>
Fri, 7 Jan 2011 20:53:45 +0000 (20:53 +0000)
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: https://origsvn.digium.com/svn/asterisk/trunk@301091 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_meetme.c

index 234ed58..5068771 100644 (file)
@@ -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;