Mercurial > hg > bitcoin

changeset 2937:4a3f905366ac draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test ScriptSigArgsExpected() for error, before accumulating return value
author Jeff Garzik <jgarzik@exmulti.com>
date Sun, 22 Apr 2012 13:44:12 -0400
parents 380b719106a8
children 0bda0fe7f025
files src/main.cpp
diffstat 1 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -304,6 +304,8 @@
         if (!Solver(prevScript, whichType, vSolutions))
             return false;
         int nArgsExpected = ScriptSigArgsExpected(whichType, vSolutions);
+        if (nArgsExpected < 0)
+            return false;
 
         // Transactions with extra stuff in their scriptSigs are
         // non-standard. Note that this EvalScript() call will
@@ -325,10 +327,15 @@
                 return false;
             if (whichType2 == TX_SCRIPTHASH)
                 return false;
-            nArgsExpected += ScriptSigArgsExpected(whichType2, vSolutions2);
+
+            int tmpExpected;
+            tmpExpected = ScriptSigArgsExpected(whichType2, vSolutions2);
+            if (tmpExpected < 0)
+                return false;
+            nArgsExpected += tmpExpected;
         }
 
-        if (stack.size() != nArgsExpected)
+        if (stack.size() != (unsigned int)nArgsExpected)
             return false;
     }