From: Josh Date: Fri, 3 Oct 2014 14:32:19 +0000 (-0500) Subject: fixing markup output X-Git-Tag: 3.0.0-233~1397^2~19^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdbeeafd15fb8a97092f1c84d847111b16cac7ef;p=thirdparty%2Fsnort3.git fixing markup output --- diff --git a/src/helpers/markup.cc b/src/helpers/markup.cc index be463b365..1289819b4 100644 --- a/src/helpers/markup.cc +++ b/src/helpers/markup.cc @@ -53,7 +53,7 @@ const string& Markup::sanitize(const char* const c) const string& Markup::sanitize(const string& s) { - const char* const asciidoc_chars = "~*<>^'"; + const char* const asciidoc_chars = "*<>^'"; static string m; m.clear(); m += s; diff --git a/src/managers/module_manager.cc b/src/managers/module_manager.cc index cf6fb7fe1..62ea88683 100644 --- a/src/managers/module_manager.cc +++ b/src/managers/module_manager.cc @@ -249,12 +249,12 @@ static const Parameter* get_params(const string& sfx, const Parameter* p) if ( p[0].name && !p[1].name ) return p; else - new_fqn = sfx; + new_fqn = sfx; } else - { + { new_fqn = sfx.substr(pos + 1); - } + } string name = new_fqn.substr(0, new_fqn.find_first_of('.')); while ( p->name && name != p->name ) @@ -274,6 +274,8 @@ static const Parameter* get_params(const string& sfx, const Parameter* p) const Parameter* tmp_p = reinterpret_cast(p->range); + // FIXIT -- this will fail if we are opening a + // a list with only one Parameter if ( tmp_p[0].name && !tmp_p[1].name ) return tmp_p; }