From: Maria Matejka <mq@ucw.cz>
Date: Fri, 21 Jun 2019 09:33:28 +0000 (+0200)
Subject: Filter instructions don't confuse now v1 and res.
X-Git-Tag: v2.0.5~10^2~22^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e0777317f373921487d80e88c376d23a842ba2c;p=thirdparty%2Fbird.git

Filter instructions don't confuse now v1 and res.
---

diff --git a/filter/f-inst.c b/filter/f-inst.c
index 749e072ce..7349bf729 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -50,26 +50,26 @@
   INST(FI_ADD, 2, 1) {
     ARG(1,T_INT);
     ARG(2,T_INT);
-    res.val.i += v2.val.i;
+    res.val.i = v1.val.i + v2.val.i;
     RESULT_OK;
   }
   INST(FI_SUBTRACT, 2, 1) {
     ARG(1,T_INT);
     ARG(2,T_INT);
-    res.val.i -= v2.val.i;
+    res.val.i = v1.val.i - v2.val.i;
     RESULT_OK;
   }
   INST(FI_MULTIPLY, 2, 1) {
     ARG(1,T_INT);
     ARG(2,T_INT);
-    res.val.i *= v2.val.i;
+    res.val.i = v1.val.i * v2.val.i;
     RESULT_OK;
   }
   INST(FI_DIVIDE, 2, 1) {
     ARG(1,T_INT);
     ARG(2,T_INT);
     if (v2.val.i == 0) runtime( "Mother told me not to divide by 0" );
-    res.val.i /= v2.val.i;
+    res.val.i = v1.val.i / v2.val.i;
     RESULT_OK;
   }
   INST(FI_AND, 1, 1) {