Properly initialize the extended 2-dimensional Route struct to avoid …

…SEGV.
xrootd · Jan 23, 2014 · 7436da2 · 7436da2
1 parent 2b92d16
commit 7436da2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/XrdXrootd/XrdXrootdConfig.cc b/src/XrdXrootd/XrdXrootdConfig.cc
@@ -212,6 +212,7 @@ int XrdXrootdProtocol::Configure(char *parms, XrdProtocol_Config *pi)
 //
    if (!(as_miniosz = as_segsize/2)) as_miniosz = as_segsize;
    maxTransz = maxBuffsz = BPool->MaxSize();
+   memset(Route, 0, sizeof(Route));
 
 // Now process and configuration parameters
 //

diff --git a/src/XrdXrootd/XrdXrootdProtocol.cc b/src/XrdXrootd/XrdXrootdProtocol.cc
@@ -111,8 +111,7 @@ int                   XrdXrootdProtocol::myPID = static_cast<int>(getpid());
 int                   XrdXrootdProtocol::myRole = 0;
 int                   XrdXrootdProtocol::myRolf = 0;
 
-struct XrdXrootdProtocol::RD_Table
-       XrdXrootdProtocol::Route[RD_Num] = {{{0,0},{0,0}}};
+struct XrdXrootdProtocol::RD_Table XrdXrootdProtocol::Route[RD_Num];
 
 /******************************************************************************/
 /*            P r o t o c o l   M a n a g e m e n t   S t a c k s             */