LGTM

jelu · jelu · commit 90a5e55881a8 · 2020-06-04T10:01:17.000+02:00
- Fix LGTM alerts
- Remove HTML and JavaScript from LGTM analysis
diff --git a/.lgtm.yml b/.lgtm.yml
@@ -1,3 +1,7 @@
+path_classifiers:
+  library:
+    - "html/*"
+    - "html_NG/*"
 extraction:
   cpp:
     prepare:
diff --git a/src/packetq.cpp b/src/packetq.cpp
@@ -304,7 +304,7 @@ int main(int argc, char* argv[])
 
     delete g_app;
 
-    void destroy_packet_handlers();
+    destroy_packet_handlers();
 
     return 0;
 }
diff --git a/src/server.cpp b/src/server.cpp
@@ -121,13 +121,6 @@ namespace httpd {
                 m_len = len;
                 m_pos = 0;
             }
-            Buffer(const Buffer& buf)
-            {
-                m_len = buf.m_len;
-                m_buf = new unsigned char[buf.m_len];
-                memcpy(m_buf, buf.m_buf, m_len);
-                m_pos = 0;
-            }
             ~Buffer()
             {
                 m_len = 0;
@@ -988,7 +981,6 @@ namespace httpd {
                         m_file     = 0;
                     }
                     set_delete();
-                } else {
                 }
             }
         }
diff --git a/src/sql.cpp b/src/sql.cpp
@@ -1156,6 +1156,7 @@ class Parser {
             bool asc = true;
             if (it->get_type() == Token::_label) {
                 if (cmpi(it->get_token(), "asc")) {
+                    // default
                 } else if (cmpi(it->get_token(), "desc")) {
                     asc = false;
                 } else if (cmpi(it->get_token(), "collate")) {
diff --git a/src/sql.h b/src/sql.h
@@ -166,7 +166,6 @@ class DB {
         i.m_key      = key;
         std::map<Item, std::string>::iterator it = m_lut.find(i);
         if (it != m_lut.end())
-            // FIXME: we should store these strings in the first place
             return RefCountString::construct(it->second.c_str());
 
         return 0;
@@ -530,7 +529,7 @@ class Token {
     {
         m_token = istr;
     }
-    const Type get_type() const
+    Type get_type() const
     {
         return m_type;
     }
@@ -561,7 +560,7 @@ class OP : public Token {
         return 0;
     }
 
-    OP(const OP& op)
+    OP(const OP& op) // lgtm[cpp/rule-of-two]
         : Token(op.get_type(), op.get_token())
     {
         for (int i = 0; i < max_param(); i++) {
@@ -890,13 +889,13 @@ class Rsplit_func : public OP {
             }
             p--;
         }
-        char buf[256]; // FIXME: arbitrary limitation, would probably be
-        // better to allocate result buffer directly
-        if (found < n || start >= l || end - start > sizeof(buf)) {
+        if (found < n || start >= l) {
             RefCountStringHandle res(RefCountString::construct(""));
             v = *res;
             return;
         }
+        size_t buflen = start < end ? end - start + 1 : 1;
+        char buf[buflen];
         p = 0;
         while (start < end)
             buf[p++] = s[start++];
diff --git a/src/tcp.cpp b/src/tcp.cpp
@@ -78,15 +78,6 @@ class Data_segment {
             m_data[i] = data[i];
         }
     }
-    /// Copy constructor
-    Data_segment(const Data_segment& other)
-    {
-        m_datasize = other.m_datasize;
-        m_data     = new unsigned char[m_datasize];
-        for (unsigned int i = 0; i < m_datasize; i++) {
-            m_data[i] = other.m_data[i];
-        }
-    }
     /// Destructor
     ~Data_segment()
     {
diff --git a/src/variant.h b/src/variant.h
@@ -91,14 +91,14 @@ inline text_column convert_column_to_text(float_column v)
 {
     const int       bufsize = 50;
     RefCountString* str     = RefCountString::allocate(bufsize);
-    snprintf(str->data, bufsize, "%g", v);
+    snprintf(str->data, bufsize, "%g", v); // lgtm[cpp/badly-bounded-write]
     return str;
 }
 inline text_column convert_column_to_text(int_column v)
 {
     const int       bufsize = (sizeof(int_column) * 8 + 1) / 3 + 1;
     RefCountString* str     = RefCountString::allocate(bufsize);
-    snprintf(str->data, bufsize, "%d", v);
+    snprintf(str->data, bufsize, "%d", v); // lgtm[cpp/badly-bounded-write]
     return str;
 }
 inline text_column convert_column_to_text(bool_column v)

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ int main(int argc, char* argv[])`
`304`	`304`
`305`	`305`	`delete g_app;`
`306`	`306`
`307`		`- void destroy_packet_handlers();`
	`307`	`+ destroy_packet_handlers();`
`308`	`308`
`309`	`309`	`return 0;`
`310`	`310`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,13 +121,6 @@ namespace httpd {`
`121`	`121`	`m_len = len;`
`122`	`122`	`m_pos = 0;`
`123`	`123`	`}`
`124`		`- Buffer(const Buffer& buf)`
`125`		`- {`
`126`		`- m_len = buf.m_len;`
`127`		`- m_buf = new unsigned char[buf.m_len];`
`128`		`- memcpy(m_buf, buf.m_buf, m_len);`
`129`		`- m_pos = 0;`
`130`		`- }`
`131`	`124`	`~Buffer()`
`132`	`125`	`{`
`133`	`126`	`m_len = 0;`
`@@ -988,7 +981,6 @@ namespace httpd {`
`988`	`981`	`m_file = 0;`
`989`	`982`	`}`
`990`	`983`	`set_delete();`
`991`		`- } else {`
`992`	`984`	`}`
`993`	`985`	`}`
`994`	`986`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,6 @@ class DB {`
`166`	`166`	`i.m_key = key;`
`167`	`167`	`std::map<Item, std::string>::iterator it = m_lut.find(i);`
`168`	`168`	`if (it != m_lut.end())`
`169`		`- // FIXME: we should store these strings in the first place`
`170`	`169`	`return RefCountString::construct(it->second.c_str());`
`171`	`170`
`172`	`171`	`return 0;`
`@@ -530,7 +529,7 @@ class Token {`
`530`	`529`	`{`
`531`	`530`	`m_token = istr;`
`532`	`531`	`}`
`533`		`- const Type get_type() const`
	`532`	`+ Type get_type() const`
`534`	`533`	`{`
`535`	`534`	`return m_type;`
`536`	`535`	`}`
`@@ -561,7 +560,7 @@ class OP : public Token {`
`561`	`560`	`return 0;`
`562`	`561`	`}`
`563`	`562`
`564`		`- OP(const OP& op)`
	`563`	`+ OP(const OP& op) // lgtm[cpp/rule-of-two]`
`565`	`564`	`: Token(op.get_type(), op.get_token())`
`566`	`565`	`{`
`567`	`566`	`for (int i = 0; i < max_param(); i++) {`
`@@ -890,13 +889,13 @@ class Rsplit_func : public OP {`
`890`	`889`	`}`
`891`	`890`	`p--;`
`892`	`891`	`}`
`893`		`- char buf[256]; // FIXME: arbitrary limitation, would probably be`
`894`		`- // better to allocate result buffer directly`
`895`		`- if (found < n \|\| start >= l \|\| end - start > sizeof(buf)) {`
	`892`	`+ if (found < n \|\| start >= l) {`
`896`	`893`	`RefCountStringHandle res(RefCountString::construct(""));`
`897`	`894`	`v = *res;`
`898`	`895`	`return;`
`899`	`896`	`}`
	`897`	`+ size_t buflen = start < end ? end - start + 1 : 1;`
	`898`	`+ char buf[buflen];`
`900`	`899`	`p = 0;`
`901`	`900`	`while (start < end)`
`902`	`901`	`buf[p++] = s[start++];`
Original file line number	Diff line number	Diff line change
`@@ -78,15 +78,6 @@ class Data_segment {`
`78`	`78`	`m_data[i] = data[i];`
`79`	`79`	`}`
`80`	`80`	`}`
`81`		`- /// Copy constructor`
`82`		`- Data_segment(const Data_segment& other)`
`83`		`- {`
`84`		`- m_datasize = other.m_datasize;`
`85`		`- m_data = new unsigned char[m_datasize];`
`86`		`- for (unsigned int i = 0; i < m_datasize; i++) {`
`87`		`- m_data[i] = other.m_data[i];`
`88`		`- }`
`89`		`- }`
`90`	`81`	`/// Destructor`
`91`	`82`	`~Data_segment()`
`92`	`83`	`{`
Original file line number	Diff line number	Diff line change
`@@ -91,14 +91,14 @@ inline text_column convert_column_to_text(float_column v)`
`91`	`91`	`{`
`92`	`92`	`const int bufsize = 50;`
`93`	`93`	`RefCountString* str = RefCountString::allocate(bufsize);`
`94`		`- snprintf(str->data, bufsize, "%g", v);`
	`94`	`+ snprintf(str->data, bufsize, "%g", v); // lgtm[cpp/badly-bounded-write]`
`95`	`95`	`return str;`
`96`	`96`	`}`
`97`	`97`	`inline text_column convert_column_to_text(int_column v)`
`98`	`98`	`{`
`99`	`99`	`const int bufsize = (sizeof(int_column) * 8 + 1) / 3 + 1;`
`100`	`100`	`RefCountString* str = RefCountString::allocate(bufsize);`
`101`		`- snprintf(str->data, bufsize, "%d", v);`
	`101`	`+ snprintf(str->data, bufsize, "%d", v); // lgtm[cpp/badly-bounded-write]`
`102`	`102`	`return str;`
`103`	`103`	`}`
`104`	`104`	`inline text_column convert_column_to_text(bool_column v)`