rule parsing: valid that input rule string is UTF8

Before parsing a rule string, validate that it is UTF-8 first.

Related Redmine issue:
https://redmine.openinfosecfoundation.org/issues/3850

diff --git a/src/detect-parse.c b/src/detect-parse.c
index b9962dbf409c032b9091d6fa0f854c14e23ff7f1..b7b1e5980fb557c5692d26b43b7517c04e28fbd6 100644 (file)
--- a/src/detect-parse.c
+++ b/src/detect-parse.c
@@ -1212,6 +1212,11 @@ static int SigParse(DetectEngineCtx *de_ctx, Signature *s,
 {
     SCEnter();
 
+    if (!rs_check_utf8(sigstr)) {
+        SCLogError(SC_ERR_RULE_INVALID_UTF8, "rule is not valid UTF-8");
+        SCReturnInt(-1);
+    }
+
     s->sig_str = SCStrdup(sigstr);
     if (unlikely(s->sig_str == NULL)) {
         SCReturnInt(-1);

diff --git a/src/util-error.c b/src/util-error.c
index 0a5496767f0bc78852b040b2be51472cb2164413..64b4555c33104cef2be04766d4a8cb232985c068 100644 (file)
--- a/src/util-error.c
+++ b/src/util-error.c
@@ -376,6 +376,7 @@ const char * SCErrorToString(SCError err)
         CASE_CODE (SC_WARN_PATH_READ_ERROR);
         CASE_CODE (SC_ERR_PLUGIN);
         CASE_CODE(SC_ERR_LOG_OUTPUT);
+        CASE_CODE(SC_ERR_RULE_INVALID_UTF8);
 
         CASE_CODE (SC_ERR_MAX);
     }

diff --git a/src/util-error.h b/src/util-error.h
index 3a78ae9df5c63977b841c7a76b0269072df21696..54b320a07c88bef5a31ad0d14274034e89559073 100644 (file)
--- a/src/util-error.h
+++ b/src/util-error.h
@@ -366,6 +366,7 @@ typedef enum {
     SC_ERR_HTTP2_LOG_GENERIC,
     SC_ERR_PLUGIN,
     SC_ERR_LOG_OUTPUT,
+    SC_ERR_RULE_INVALID_UTF8,
 
     SC_ERR_MAX
 } SCError;