[Forensics-changes] [yara] 158/368: Fix bug in previous commit

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag v3.5.0
in repository yara.

commit 60e505b1e6bef8b4ea3b2df0722dbf95b6304092
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Fri Jan 22 21:08:40 2016 +0100

    Fix bug in previous commit
---
 libyara/grammar.c | 4 ++--
 libyara/grammar.y | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libyara/grammar.c b/libyara/grammar.c
index 63db701..08d08cc 100644
--- a/libyara/grammar.c
+++ b/libyara/grammar.c
@@ -1809,7 +1809,7 @@ yyreduce:
   case 10:
 #line 233 "grammar.y"
     {
-        YR_RULE* rule = (yyvsp[(6) - (8)].rule); // rule created in phase 1
+        YR_RULE* rule = (yyvsp[(4) - (8)].rule); // rule created in phase 1
 
         rule->tags = (yyvsp[(5) - (8)].c_string);
         rule->metas = (yyvsp[(7) - (8)].meta);
@@ -1820,7 +1820,7 @@ yyreduce:
   case 11:
 #line 241 "grammar.y"
     {
-        YR_RULE* rule = (yyvsp[(6) - (11)].rule); // rule created in phase 1
+        YR_RULE* rule = (yyvsp[(4) - (11)].rule); // rule created in phase 1
 
         compiler->last_result = yr_parser_reduce_rule_declaration_phase_2(
             yyscanner, rule);
diff --git a/libyara/grammar.y b/libyara/grammar.y
index 6cbfe83..22fa7f5 100644
--- a/libyara/grammar.y
+++ b/libyara/grammar.y
@@ -231,7 +231,7 @@ rule
       }
       tags '{' meta strings
       {
-        YR_RULE* rule = $<rule>6; // rule created in phase 1
+        YR_RULE* rule = $<rule>4; // rule created in phase 1
 
         rule->tags = $5;
         rule->metas = $7;
@@ -239,7 +239,7 @@ rule
       }
       condition '}'
       {
-        YR_RULE* rule = $<rule>6; // rule created in phase 1
+        YR_RULE* rule = $<rule>4; // rule created in phase 1
 
         compiler->last_result = yr_parser_reduce_rule_declaration_phase_2(
             yyscanner, rule);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git