Convert a ton of uses of MAXBUF to use a fixed buffer size.

diff --git a/src/configparser.cpp b/src/configparser.cpp
index 61cdb55fa160ded9627f7b90cc369bfc6793aaa2..31d3141482aaef9452339d1838863daa7c45b09d 100644 (file)
--- a/src/configparser.cpp
+++ b/src/configparser.cpp
@@ -327,7 +327,7 @@ void ParseStack::DoReadFile(const std::string& key, const std::string& name, int
        file_cache& cache = FilesOutput[key];
        cache.clear();
 
-       char linebuf[MAXBUF*10];
+       char linebuf[5120];
        while (fgets(linebuf, sizeof(linebuf), file))
        {
                size_t len = strlen(linebuf);

diff --git a/src/logger.cpp b/src/logger.cpp
index 1a63499d6afaa7b01c334e2fd2b5a55589e9d1b6..03960f4a1655188189e6bafe2178c2cae398bcc3 100644 (file)
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -116,10 +116,10 @@ void LogManager::OpenFileLogs()
                std::map<std::string, FileWriter*>::iterator fwi = logmap.find(target);
                if (fwi == logmap.end())
                {
-                       char realtarget[MAXBUF];
+                       char realtarget[256];
                        time_t time = ServerInstance->Time();
                        struct tm *mytime = gmtime(&time);
-                       strftime(realtarget, MAXBUF, target.c_str(), mytime);
+                       strftime(realtarget, sizeof(realtarget), target.c_str(), mytime);
                        FILE* f = fopen(realtarget, "a");
                        fw = new FileWriter(f);
                        logmap.insert(std::make_pair(target, fw));

diff --git a/src/modules/extra/m_mssql.cpp b/src/modules/extra/m_mssql.cpp
index 244aa0922a006cecc04020d867ae2a71c60976c6..9d9622fde40a4254fdfc42ed63b6c75c8cfac2b4 100644 (file)
--- a/src/modules/extra/m_mssql.cpp
+++ b/src/modules/extra/m_mssql.cpp
@@ -472,8 +472,8 @@ class SQLConn : public classbase
                                                if (sock->res_info->row_count > 0)
                                                {
                                                        int cols = sock->res_info->num_cols;
-                                                       char** name = new char*[MAXBUF];
-                                                       char** data = new char*[MAXBUF];
+                                                       char** name = new char*[512];
+                                                       char** data = new char*[512];
                                                        for (int j=0; j<cols; j++)
                                                        {
                                                                TDSCOLUMN* col = sock->current_results->columns[j];

diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 8faee2da7b710e6708ccf43f256020f73cbc9ea3..f9fddd5a1d6af4b03d7f02cdd6322232e6e14ccb 100644 (file)
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -803,8 +803,8 @@ class ModuleSSLGnuTLS : public Module
                int ret;
                unsigned int cert_list_size;
                gnutls_x509_crt_t cert;
-               char name[MAXBUF];
-               unsigned char digest[MAXBUF];
+               char name[512];
+               unsigned char digest[512];
                size_t digest_size = sizeof(digest);
                size_t name_size = sizeof(name);
                ssl_cert* certinfo = new ssl_cert;

diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index 00ff75f59383df0f42a691c9ac8a558bded4d3c6..9f67a62423907e73bd3fe6ea6724fefd4102f846 100644 (file)
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -213,8 +213,8 @@ class IdentRequestSocket : public EventHandler
                /* We don't really need to buffer for incomplete replies here, since IDENT replies are
                 * extremely short - there is *no* sane reason it'd be in more than one packet
                 */
-               char ibuf[MAXBUF];
-               int recvresult = ServerInstance->SE->Recv(this, ibuf, MAXBUF-1, 0);
+               char ibuf[256];
+               int recvresult = ServerInstance->SE->Recv(this, ibuf, sizeof(ibuf)-1, 0);
 
                /* Close (but don't delete from memory) our socket
                 * and flag as done since the ident lookup has finished