Update yara submodule and stop using deprecated fields.

plusvic · plusvic · commit fe52a658cb61 · 2020-12-24T13:06:38.000+01:00
diff --git a/yara b/yara
@@ -1 +1 @@
-Subproject commit cba6932759ec16a61288b1314b3aee1103ad03ec
+Subproject commit 60d857203f808c2e580a377a211e6c3c5c9520ab
diff --git a/yara-python.c b/yara-python.c
@@ -1320,7 +1320,7 @@ static PyObject* Rules_next(
 
   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);
     return NULL;
   }
@@ -2172,7 +2172,7 @@ static PyObject* yara_compile(
         if (error == ERROR_SUCCESS)
         {
           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)
             rules->externals = PyDict_Copy(externals);
@@ -2273,8 +2273,8 @@ static PyObject* yara_load(
       "load() expects either a file path or a file-like object");
   }
 
-  external = rules->rules->externals_list_head;
-  rules->iter_current_rule = rules->rules->rules_list_head;
+  external = rules->rules->ext_vars_table;
+  rules->iter_current_rule = rules->rules->rules_table;
 
   if (!EXTERNAL_VARIABLE_IS_NULL(external))
     rules->externals = PyDict_New();

Original file line number	Diff line number	Diff line change
`@@ -1320,7 +1320,7 @@ static PyObject* Rules_next(`
`1320`	`1320`
`1321`	`1321`	`if (RULE_IS_NULL(rules->iter_current_rule))`
`1322`	`1322`	`{`
`1323`		`- rules->iter_current_rule = rules->rules->rules_list_head;`
	`1323`	`+ rules->iter_current_rule = rules->rules->rules_table;`
`1324`	`1324`	`PyErr_SetNone(PyExc_StopIteration);`
`1325`	`1325`	`return NULL;`
`1326`	`1326`	`}`
`@@ -2172,7 +2172,7 @@ static PyObject* yara_compile(`
`2172`	`2172`	`if (error == ERROR_SUCCESS)`
`2173`	`2173`	`{`
`2174`	`2174`	`rules->rules = yara_rules;`
`2175`		`- rules->iter_current_rule = rules->rules->rules_list_head;`
	`2175`	`+ rules->iter_current_rule = rules->rules->rules_table;`
`2176`	`2176`
`2177`	`2177`	`if (externals != NULL && externals != Py_None)`
`2178`	`2178`	`rules->externals = PyDict_Copy(externals);`
`@@ -2273,8 +2273,8 @@ static PyObject* yara_load(`
`2273`	`2273`	`"load() expects either a file path or a file-like object");`
`2274`	`2274`	`}`
`2275`	`2275`
`2276`		`- external = rules->rules->externals_list_head;`
`2277`		`- rules->iter_current_rule = rules->rules->rules_list_head;`
	`2276`	`+ external = rules->rules->ext_vars_table;`
	`2277`	`+ rules->iter_current_rule = rules->rules->rules_table;`
`2278`	`2278`
`2279`	`2279`	`if (!EXTERNAL_VARIABLE_IS_NULL(external))`
`2280`	`2280`	`rules->externals = PyDict_New();`