From: Philippe Antoine <contact@catenacyber.fr>
Date: Wed, 15 Apr 2020 09:48:13 +0000 (+0200)
Subject: conf: returns instead of exiting in ConfYamlParse
X-Git-Tag: suricata-5.0.3~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e2036314cf01c8dd3797d72a97078d8b85ee5ef;p=thirdparty%2Fsuricata.git

conf: returns instead of exiting in ConfYamlParse

So that we can keep on fuzzing even on too much recursion

(cherry picked from commit fe1d36ec7eff8fecbe39f4d7447c0ab24a9d37ee)
---

diff --git a/src/conf-yaml-loader.c b/src/conf-yaml-loader.c
index c9cc2a7486..307cdab925 100644
--- a/src/conf-yaml-loader.c
+++ b/src/conf-yaml-loader.c
@@ -185,8 +185,9 @@ ConfYamlParse(yaml_parser_t *parser, ConfNode *parent, int inseq, int rlevel)
     int retval = 0;
 
     if (rlevel++ > RECURSION_LIMIT) {
-        FatalError(SC_ERR_FATAL, "Recursion limit reached while parsing "
+        SCLogError(SC_ERR_CONF_YAML_ERROR, "Recursion limit reached while parsing "
                 "configuration file, aborting.");
+        return -1;
     }
 
     while (!done) {