classtype: use global defines for size limits

diff --git a/src/detect-classtype.c b/src/detect-classtype.c
index b2766aa325177fa7b59bdaa3ae73cb2e620fb287..aadf8f9c9dbf57b2e56acfc259a46ac40220e7aa 100644 (file)
--- a/src/detect-classtype.c
+++ b/src/detect-classtype.c
@@ -99,7 +99,7 @@ static int DetectClasstypeParseRawString(const char *rawstr, char *out, size_t o
  */
 static int DetectClasstypeSetup(DetectEngineCtx *de_ctx, Signature *s, const char *rawstr)
 {
-    char parsed_ct_name[1024] = "";
+    char parsed_ct_name[CLASSTYPE_NAME_MAX_LEN] = "";
 
     if ((s->class_id > 0) || (s->class_msg != NULL)) {
         SCLogWarning(SC_ERR_CONFLICTING_RULE_KEYWORDS, "duplicated 'classtype' "
@@ -133,7 +133,7 @@ static int DetectClasstypeSetup(DetectEngineCtx *de_ctx, Signature *s, const cha
                     parsed_ct_name, DETECT_DEFAULT_PRIO);
         }
 
-        char str[2048];
+        char str[256];
         snprintf(str, sizeof(str),
                 "config classification: %s,Unknown Classtype,%d\n",
                 parsed_ct_name, DETECT_DEFAULT_PRIO);

diff --git a/src/util-classification-config.c b/src/util-classification-config.c
index 1f12a4085eb081efdbcda6dc7325707a54abba43..1d7df5de801463358a81d58564611ac55cdab081 100644 (file)
--- a/src/util-classification-config.c
+++ b/src/util-classification-config.c
@@ -250,8 +250,8 @@ static char *SCClassConfStringToLowercase(const char *str)
  */
 int SCClassConfAddClasstype(DetectEngineCtx *de_ctx, char *rawstr, uint16_t index)
 {
-    char ct_name[64];
-    char ct_desc[512];
+    char ct_name[CLASSTYPE_NAME_MAX_LEN];
+    char ct_desc[CLASSTYPE_DESC_MAX_LEN];
     char ct_priority_str[16];
     int ct_priority = 0;
     uint16_t ct_id = index;

diff --git a/src/util-classification-config.h b/src/util-classification-config.h
index 194001af990088ba329a944b77c7682d6df6cbb2..64f67cfc8d51e9e30035bf727cdbee457d0b8357 100644 (file)
--- a/src/util-classification-config.h
+++ b/src/util-classification-config.h
@@ -24,6 +24,9 @@
 #ifndef __UTIL_CLASSIFICATION_CONFIG_H__
 #define __UTIL_CLASSIFICATION_CONFIG_H__
 
+#define CLASSTYPE_NAME_MAX_LEN 64
+#define CLASSTYPE_DESC_MAX_LEN 512
+
 /**
  * \brief Container for a Classtype from the Classification.config file.
  */