Fix occasional crash on second and more reload in SMUX plugin

[stg.git] / stglibs / srvconf.lib / parser.cpp

diff --git a/stglibs/srvconf.lib/parser.cpp b/stglibs/srvconf.lib/parser.cpp
index 139c91bc6dc0a1b775ec11df1977523cda393498..a87266eb5cb57d37fd6cb81f002134cbdde1e547 100644 (file)
--- a/stglibs/srvconf.lib/parser.cpp
+++ b/stglibs/srvconf.lib/parser.cpp
@@ -33,10 +33,9 @@
 #include <arpa/inet.h>
 #include <string>
 
 #include <arpa/inet.h>
 #include <string>
 

-#include "common.h"
-//#include "srvconf_common.h"
-#include "stg_const.h"
-#include "servconf.h"
+#include "stg/common.h"
+#include "stg/const.h"
+#include "stg/servconf.h"

 
 using namespace std;
 
 
 using namespace std;
 


@@ -46,6 +45,7 @@ using namespace std;
 PARSER_GET_USERS::PARSER_GET_USERS()
     : RecvUserDataCb(NULL),
       userDataCb(NULL),
 PARSER_GET_USERS::PARSER_GET_USERS()
     : RecvUserDataCb(NULL),
       userDataCb(NULL),

+      user(),

       depth(0),
       error(false)
 {
       depth(0),
       error(false)
 {


@@ -165,6 +165,14 @@ if (strcasecmp(el, "credit") == 0)
         }
     }
 
         }
     }
 

+if (strcasecmp(el, "creditExpire") == 0)
+    {
+    if (str2x(attr[1], user.creditExpire) < 0)
+        {
+        return;
+        }
+    }
+

 /*if (strcasecmp(el, "freemb") == 0)
     {
     if (strtodouble2(attr[1], user.freeMb) < 0)
 /*if (strcasecmp(el, "freemb") == 0)
     {
     if (strtodouble2(attr[1], user.freeMb) < 0)


@@ -379,6 +387,7 @@ userDataCb = data;
 PARSER_GET_USER::PARSER_GET_USER()
     : RecvUserDataCb(NULL),
       userDataCb(NULL),
 PARSER_GET_USER::PARSER_GET_USER()
     : RecvUserDataCb(NULL),
       userDataCb(NULL),

+      user(),

       depth(0),
       error(false)
 {
       depth(0),
       error(false)
 {


@@ -518,6 +527,14 @@ if (strcasecmp(el, "currip") == 0)
     user.ip = inet_addr(attr[1]);
     }
 
     user.ip = inet_addr(attr[1]);
     }
 

+if (strcasecmp(el, "creditExpire") == 0)
+    {
+    if (str2x(attr[1], user.creditExpire) < 0)
+        {
+        return;
+        }
+    }
+

 for (int i = 0; i < USERDATA_NUM; i++)
     {
     string num;
 for (int i = 0; i < USERDATA_NUM; i++)
     {
     string num;


@@ -649,7 +666,8 @@ PARSER_GET_SERVER_INFO::PARSER_GET_SERVER_INFO()
     : RecvServerInfoDataCb(NULL),
       serverInfoDataCb(NULL),
       depth(0),
     : RecvServerInfoDataCb(NULL),
       serverInfoDataCb(NULL),
       depth(0),

-      error(false)
+      error(false),
+      serverInfo()

 {
 }
 //-----------------------------------------------------------------------------
 {
 }
 //-----------------------------------------------------------------------------