X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Frrd_rpncalc.c;h=65c124ee43ad8fe0ea18f0f64f7aa0efd8c9792f;hb=6a4cb994a55825b9b0d5028f8ca344a36e301929;hp=839643b0075101429fe4171b9297f0d3867d11d0;hpb=2ebb9e5e4cd81f7f389600a475a6f3e4f8afc87f;p=rrdtool.git

diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c
index 839643b..65c124e 100644
--- a/src/rrd_rpncalc.c
+++ b/src/rrd_rpncalc.c
@@ -547,14 +547,15 @@ short rpn_calc(
             break;
         case OP_ADDNAN:
             stackunderflow(1);
-			if (isnan(rpnstack->s[stptr - 1])) {
-	            rpnstack->s[stptr - 1] = rpnstack->s[stptr];
-			} else if (isnan(rpnstack->s[stptr])) {
-	            //rpnstack->s[stptr - 1] = rpnstack->s[stptr - 1];
-			} else {
- 	           rpnstack->s[stptr - 1] = rpnstack->s[stptr - 1]
-    	            + rpnstack->s[stptr];
-			}
+            if (isnan(rpnstack->s[stptr - 1])) {
+                rpnstack->s[stptr - 1] = rpnstack->s[stptr];
+            } else if (isnan(rpnstack->s[stptr])) {
+                /* NOOP */
+                /* rpnstack->s[stptr - 1] = rpnstack->s[stptr - 1]; */
+            } else {
+                rpnstack->s[stptr - 1] = rpnstack->s[stptr - 1]
+                    + rpnstack->s[stptr];
+            }
 
             stptr--;
             break;
@@ -705,8 +706,10 @@ short rpn_calc(
             break;
         case OP_IF:
             stackunderflow(2);
-            rpnstack->s[stptr - 2] = rpnstack->s[stptr - 2] != 0.0 ?
-                rpnstack->s[stptr - 1] : rpnstack->s[stptr];
+            rpnstack->s[stptr - 2] = (isnan(rpnstack->s[stptr - 2])
+                                      || rpnstack->s[stptr - 2] ==
+                                      0.0) ? rpnstack->s[stptr] : rpnstack->
+                s[stptr - 1];
             stptr--;
             stptr--;
             break;