Fix memory leaks on reloadmodule and spanningtree unload while connecting servers

[user/henk/code/inspircd.git] / src / modules / m_httpd_stats.cpp

diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index a451f6af99d039051888fbab74c61c94f1258526..a0aa202ab881556b38f82be5432a3424439bfbd1 100644 (file)
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -73,10 +73,10 @@ class ModuleHttpStats : public Module
                {
                        ExtensionItem* item = i->first;
                        std::string value = item->serialize(FORMAT_USER, ext, i->second);
-                       if (value.empty())
-                               data << "<meta name=\"" << item->key << "\"/>";
-                       else
+                       if (!value.empty())
                                data << "<meta name=\"" << item->key << "\">" << Sanitize(value) << "</meta>";
+                       else if (!item->key.empty())
+                               data << "<meta name=\"" << item->key << "\"/>";
                }
                data << "</metadata>";
        }
@@ -96,8 +96,7 @@ class ModuleHttpStats : public Module
 
                                data << "<server><name>" << ServerInstance->Config->ServerName << "</name><gecos>"
                                        << Sanitize(ServerInstance->Config->ServerDesc) << "</gecos><version>"
-                                       << Sanitize(ServerInstance->GetVersionString()) << "</version><revision>"
-                                       << Sanitize(ServerInstance->GetRevision()) << "</revision></server>";
+                                       << Sanitize(ServerInstance->GetVersionString()) << "</version></server>";
 
                                data << "<general>";
                                data << "<usercount>" << ServerInstance->Users->clientlist->size() << "</usercount>";
@@ -144,7 +143,9 @@ class ModuleHttpStats : public Module
                                                Membership* memb = x->second;
                                                data << "<channelmember><uid>" << memb->user->uuid << "</uid><privs>"
                                                        << Sanitize(c->GetAllPrefixChars(x->first)) << "</privs><modes>"
-                                                       << memb->modes << "</modes></channelmember>";
+                                                       << memb->modes << "</modes>";
+                                               DumpMeta(data, memb);
+                                               data << "</channelmember>";
                                        }
 
                                        DumpMeta(data, c);
@@ -165,10 +166,12 @@ class ModuleHttpStats : public Module
                                        if (IS_AWAY(u))
                                                data << "<away>" << Sanitize(u->awaymsg) << "</away><awaytime>" << u->awaytime << "</awaytime>";
                                        if (IS_OPER(u))
-                                               data << "<opertype>" << Sanitize(u->oper) << "</opertype>";
+                                               data << "<opertype>" << Sanitize(u->oper->NameStr()) << "</opertype>";
                                        data << "<modes>" << u->FormatModes() << "</modes><ident>" << Sanitize(u->ident) << "</ident>";
-                                       if (IS_LOCAL(u))
-                                               data << "<port>" << u->GetServerPort() << "</port><servaddr>" << irc::sockets::satouser(&u->server_sa) << "</servaddr>";
+                                       LocalUser* lu = IS_LOCAL(u);
+                                       if (lu)
+                                               data << "<port>" << lu->GetServerPort() << "</port><servaddr>"
+                                                       << irc::sockets::satouser(lu->server_sa) << "</servaddr>";
                                        data << "<ipaddress>" << u->GetIPString() << "</ipaddress>";
 
                                        DumpMeta(data, u);