File tree 3 files changed +8
-6
lines changed
3 files changed +8
-6
lines changed Original file line number Diff line number Diff line change @@ -75,7 +75,7 @@ bool Lua::load(std::string script, std::string *err) {
75
75
const char *luaerr = lua_tostring (L, -1 );
76
76
err->assign (" Failed to compile script '" + script + " " );
77
77
if (luaerr) {
78
- err->append (" : " + * luaerr);
78
+ err->append (" : " + std::string ( luaerr) );
79
79
}
80
80
err->append (" ." );
81
81
lua_close (L);
@@ -91,7 +91,7 @@ bool Lua::load(std::string script, std::string *err) {
91
91
const char *luaerr = lua_tostring (L, -1 );
92
92
err->assign (" Failed to compile script '" + script + " " );
93
93
if (luaerr) {
94
- err->append (" : " + * luaerr);
94
+ err->append (" : " + std::string ( luaerr) );
95
95
}
96
96
err->append (" ." );
97
97
lua_close (L);
@@ -366,6 +366,8 @@ int Lua::setvar(lua_State *L) {
366
366
367
367
t->m_collections .storeOrUpdateFirst (collection,
368
368
variableName, var_value);
369
+
370
+ return 0 ;
369
371
}
370
372
371
373
Original file line number Diff line number Diff line change @@ -1881,18 +1881,18 @@ namespace yy {
1881
1881
case 75 :
1882
1882
#line 1117 "seclang-parser.yy" // lalr1.cc:859
1883
1883
{
1884
+ std::string err;
1884
1885
std::vector<actions::Action *> *a = new std::vector<actions::Action *>();
1885
1886
for (auto &i : *yystack_[0 ].value .as < std::unique_ptr<std::vector<std::unique_ptr<actions::Action> > > > ().get ()) {
1886
1887
a->push_back (i.release ());
1887
1888
}
1888
-
1889
1889
RuleScript *r = new RuleScript (
1890
1890
/* path to script */ yystack_[1 ].value .as < std::string > (),
1891
1891
/* actions */ a,
1892
1892
/* file name */ driver.ref .back (),
1893
1893
/* line number */ yystack_[2 ].location .end .line
1894
1894
);
1895
- std::string err;
1895
+
1896
1896
if (r->init (&err) == false ) {
1897
1897
driver.error (yystack_[2 ].location , " Failed to load script: " + err);
1898
1898
delete r;
Original file line number Diff line number Diff line change @@ -1115,18 +1115,18 @@ expression:
1115
1115
}
1116
1116
| DIRECTIVE_SECRULESCRIPT actions
1117
1117
{
1118
+ std::string err;
1118
1119
std::vector<actions::Action *> *a = new std::vector<actions::Action *>();
1119
1120
for (auto &i : *$2 .get ()) {
1120
1121
a->push_back (i.release ());
1121
1122
}
1122
-
1123
1123
RuleScript *r = new RuleScript (
1124
1124
/* path to script */ $1 ,
1125
1125
/* actions */ a,
1126
1126
/* file name */ driver.ref .back (),
1127
1127
/* line number */ @0 .end .line
1128
1128
);
1129
- std::string err;
1129
+
1130
1130
if (r->init (&err) == false ) {
1131
1131
driver.error (@0 , " Failed to load script: " + err);
1132
1132
delete r;
You can’t perform that action at this time.
0 commit comments