fix #184

Author: digama0

src/mmpars.c

@@ -7,6 +7,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <limits.h>
 #include "mmvstr.h"
 #include "mmdata.h"
 #include "mminou.h"
@@ -2730,6 +2731,12 @@ char parseProof(long statemNum)
   return returnFlag;
 } // parseProof()
 
+long saturatingMulAdd(long x, long y, long z) {
+  if (x > LONG_MAX / y) return LONG_MAX;
+  x *= y;
+  if (x > LONG_MAX - z) return LONG_MAX;
+  return x + z;
+}
 // Parse proof in compressed format.
 // Parse proof of one statement in source file.  Uses wrkProof structure.
 // Returns 0 if OK; returns 1 if proof is incomplete (is empty or has '?'
@@ -3099,8 +3106,8 @@ char parseCompressedProof(long statemNum)
         //   * for each character c:
         //      * if c in ['U'..'Y']: n := n * 5 + (c - 'U' + 1)
         //      * if c in ['A'..'T']: n := n * 20 + (c - 'A' + 1)
-        labelMapIndex = labelMapIndex * lettersLen +
-            chrWeight[(long)(fbPtr[0])];
+        labelMapIndex = saturatingMulAdd(
+          labelMapIndex, lettersLen, chrWeight[(long)(fbPtr[0])]);
         if (labelMapIndex >= g_WrkProof.compressedPfNumLabels) {
           if (!g_WrkProof.errorCount) {
             sourceError(labelStart, tokLength, statemNum, cat(
@@ -3184,8 +3191,8 @@ char parseCompressedProof(long statemNum)
           labelMapIndex = chrWeight[(long)(fbPtr[0])] + 1;
           labelStart = fbPtr; // Save label start for error msg
         } else {
-          labelMapIndex = labelMapIndex * digitsLen +
-              chrWeight[(long)(fbPtr[0])] + 1;
+          labelMapIndex = saturatingMulAdd(
+            labelMapIndex, digitsLen, chrWeight[(long)(fbPtr[0])] + 1);
           if (bggyAlgo) labelMapIndex--; // Adjust for buggy algorithm
         }
         break;

tests/issue184.expected

@@ -0,0 +1,17 @@
+MM> READ "issue184.mm"
+Reading source file "issue184.mm"... 224 bytes
+224 bytes were read into the source buffer.
+The source has 6 statements; 0 are $a and 2 are $p.
+No errors were found.  However, proofs were not checked.  Type VERIFY PROOF *
+if you want to check them.
+MM> Continuous scrolling is now in effect.
+MM> 0 10%  20%  30%  40%  50%  60%  70%  80%  90% 100%
+..................................................
+?Error on line 12 of file "issue184.mm" at statement 6, label "evil", type
+"$p":
+    ( ww ) ABBBBBBVYVUXUUXYWYVVUUVUXWYVWYVYWG $.
+                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+This compressed label reference is outside the range of the label list.  The
+compressed label value is 9223372036854775808 but the largest label defined is
+1.
+

tests/issue184.in

@@ -0,0 +1 @@
+verify proof *

tests/issue184.mm

@@ -0,0 +1,12 @@
+  $c wff $.
+  $c |- $.
+  $v ph $.
+  wph $f wff ph $.
+
+  $( A benign ` wff ` inference. $)
+  ww $p wff ph $=
+    (  ) A $.
+
+  $( An evil ` |- ph ` proof. $)
+  evil $p |- ph $=
+    ( ww ) ABBBBBBVYVUXUUXYWYVVUUVUXWYVWYVYWG $.