Skip to content

Y
yara-python
Commit fe52a658 by Victor M. Alvarez
Options

Update yara submodule and stop using deprecated fields.

parent 53208e09
Showing with 5 additions and 5 deletions
yara @ 60d85720
Subproject commit cba6932759ec16a61288b1314b3aee1103ad03ec Subproject commit 60d857203f808c2e580a377a211e6c3c5c9520ab
yara-python.c
...@@ -1320,7 +1320,7 @@ static PyObject* Rules_next( ...@@ -1320,7 +1320,7 @@ static PyObject* Rules_next(
if (RULE_IS_NULL(rules->iter_current_rule)) if (RULE_IS_NULL(rules->iter_current_rule))
{ {
rules->iter_current_rule = rules->rules->rules_list_head; rules->iter_current_rule = rules->rules->rules_table;
PyErr_SetNone(PyExc_StopIteration); PyErr_SetNone(PyExc_StopIteration);
return NULL; return NULL;
} }
...@@ -2172,7 +2172,7 @@ static PyObject* yara_compile( ...@@ -2172,7 +2172,7 @@ static PyObject* yara_compile(
if (error == ERROR_SUCCESS) if (error == ERROR_SUCCESS)
{ {
rules->rules = yara_rules; rules->rules = yara_rules;
rules->iter_current_rule = rules->rules->rules_list_head; rules->iter_current_rule = rules->rules->rules_table;
if (externals != NULL && externals != Py_None) if (externals != NULL && externals != Py_None)
rules->externals = PyDict_Copy(externals); rules->externals = PyDict_Copy(externals);
...@@ -2273,8 +2273,8 @@ static PyObject* yara_load( ...@@ -2273,8 +2273,8 @@ static PyObject* yara_load(
"load() expects either a file path or a file-like object"); "load() expects either a file path or a file-like object");
} }
external = rules->rules->externals_list_head; external = rules->rules->ext_vars_table;
rules->iter_current_rule = rules->rules->rules_list_head; rules->iter_current_rule = rules->rules->rules_table;
if (!EXTERNAL_VARIABLE_IS_NULL(external)) if (!EXTERNAL_VARIABLE_IS_NULL(external))
rules->externals = PyDict_New(); rules->externals = PyDict_New();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment