[asterisk-commits] qwell: trunk r301091 - in /trunk: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Fri Jan  7 14:53:45 2011
New Revision: 301091

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=301091
Log:
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
  ........
................

Modified:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_meetme.c?view=diff&rev=301091&r1=301090&r2=301091
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Fri Jan  7 14:53:45 2011
@@ -3839,8 +3839,8 @@
 		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;