diff options
author | Adam <Adam@anope.org> | 2011-01-24 01:08:28 -0500 |
---|---|---|
committer | Adam <Adam@anope.org> | 2011-01-24 01:08:28 -0500 |
commit | d7206c8f386a53ccda671f67a1b4e92c7f22c293 (patch) | |
tree | 623e7e5179717c7e28888b316c2297cfff0d7108 | |
parent | 7c30d223fb42d7e1df1c2c0106e978877497dcd5 (diff) |
Fixed db upgrade loading forbidden nicks
-rw-r--r-- | modules/core/db_plain.cpp | 2 | ||||
-rw-r--r-- | src/tools/db-upgrade.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/modules/core/db_plain.cpp b/modules/core/db_plain.cpp index 041ea752e..78b71a53d 100644 --- a/modules/core/db_plain.cpp +++ b/modules/core/db_plain.cpp @@ -337,7 +337,7 @@ static void LoadNickCore(const std::vector<Anope::string> ¶ms) /* Clear default flags */ nc->ClearFlags(); - nc->pass = params[1]; + nc->pass = params.size() > 1 ? params[1] : ""; Log(LOG_DEBUG_2) << "[db_plain]: Loaded NickCore " << nc->display; } diff --git a/src/tools/db-upgrade.cpp b/src/tools/db-upgrade.cpp index d5973f4e6..0208b295f 100644 --- a/src/tools/db-upgrade.cpp +++ b/src/tools/db-upgrade.cpp @@ -191,6 +191,8 @@ int main(int argc, char *argv[]) if (line.substr(0, 2) == "NC") { std::vector<std::string> parts = BuildStringVector(line); + if (parts.size() < 3) + continue; std::string password = parts[2]; size_t colon = password.find(':'); if (colon != std::string::npos && password.substr(0, colon) != "plain") |