classtype: use global defines for size limits

pull/4288/head
Victor Julien 6 years ago
parent 99bdb54d9f
commit 517834e327

@ -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) 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)) { if ((s->class_id > 0) || (s->class_msg != NULL)) {
SCLogWarning(SC_ERR_CONFLICTING_RULE_KEYWORDS, "duplicated 'classtype' " 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); parsed_ct_name, DETECT_DEFAULT_PRIO);
} }
char str[2048]; char str[256];
snprintf(str, sizeof(str), snprintf(str, sizeof(str),
"config classification: %s,Unknown Classtype,%d\n", "config classification: %s,Unknown Classtype,%d\n",
parsed_ct_name, DETECT_DEFAULT_PRIO); parsed_ct_name, DETECT_DEFAULT_PRIO);

@ -250,8 +250,8 @@ static char *SCClassConfStringToLowercase(const char *str)
*/ */
int SCClassConfAddClasstype(DetectEngineCtx *de_ctx, char *rawstr, uint16_t index) int SCClassConfAddClasstype(DetectEngineCtx *de_ctx, char *rawstr, uint16_t index)
{ {
char ct_name[64]; char ct_name[CLASSTYPE_NAME_MAX_LEN];
char ct_desc[512]; char ct_desc[CLASSTYPE_DESC_MAX_LEN];
char ct_priority_str[16]; char ct_priority_str[16];
int ct_priority = 0; int ct_priority = 0;
uint16_t ct_id = index; uint16_t ct_id = index;

@ -24,6 +24,9 @@
#ifndef __UTIL_CLASSIFICATION_CONFIG_H__ #ifndef __UTIL_CLASSIFICATION_CONFIG_H__
#define __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. * \brief Container for a Classtype from the Classification.config file.
*/ */

Loading…
Cancel
Save