-- version 0.3.18 releasev0.3.18

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@198 1a98c847-1fd6-4fd8-948a-caf3550aa51b

5 files changed, 9 insertions, 8 deletions

diff --git a/script.cpp b/script.cpp
index a6ed15f801..a85c3710a3 100644
--- a/script.cpp
+++ b/script.cpp
@@ -997,7 +997,7 @@ bool Solver(const CScript& scriptPubKey, vector<pair<opcodetype, valtype> >& vSo
                 break;
             if (opcode2 == OP_PUBKEY)
             {
-                if (vch1.size() < 33)
+                if (vch1.size() < 33 || vch1.size() > 120)
                     break;
                 vSolutionRet.push_back(make_pair(opcode2, vch1));
             }
diff --git a/script.h b/script.h
index f724d99793..da904ef489 100644
--- a/script.h
+++ b/script.h
@@ -599,6 +599,8 @@ public:
 
     bool IsPushOnly() const
     {
+        if (size() > 200)
+            return false;
         const_iterator pc = begin();
         while (pc < end())
         {
diff --git a/serialize.h b/serialize.h
index d65ea13ec1..4e90b76c03 100644
--- a/serialize.h
+++ b/serialize.h
@@ -25,7 +25,7 @@ class CDataStream;
 class CAutoFile;
 static const unsigned int MAX_SIZE = 0x02000000;
 
-static const int VERSION = 31705;
+static const int VERSION = 31800;
 static const char* pszSubVer = "";
 
 
diff --git a/setup.nsi b/setup.nsi
index 1cb005490b..aee4a528a2 100644
--- a/setup.nsi
+++ b/setup.nsi
@@ -7,7 +7,7 @@ RequestExecutionLevel highest
 

 # General Symbol Definitions

 !define REGKEY "SOFTWARE\$(^Name)"

-!define VERSION 0.3.17

+!define VERSION 0.3.18

 !define COMPANY "Bitcoin project"

 !define URL http://www.bitcoin.org/

 

@@ -42,12 +42,12 @@ Var StartMenuGroup
 !insertmacro MUI_LANGUAGE English

 

 # Installer attributes

-OutFile bitcoin-0.3.17-win32-setup.exe

+OutFile bitcoin-0.3.18-win32-setup.exe

 InstallDir $PROGRAMFILES\Bitcoin

 CRCCheck on

 XPStyle on

 ShowInstDetails show

-VIProductVersion 0.3.17.0

+VIProductVersion 0.3.18.0

 VIAddVersionKey ProductName Bitcoin

 VIAddVersionKey ProductVersion "${VERSION}"

 VIAddVersionKey CompanyName "${COMPANY}"

diff --git a/util.cpp b/util.cpp
index 607dc3f11e..42256a9d0c 100644
--- a/util.cpp
+++ b/util.cpp
@@ -175,7 +175,6 @@ inline int OutputDebugStringF(const char* pszFormat, ...)
             va_start(arg_ptr, pszFormat);
             ret = vfprintf(fileout, pszFormat, arg_ptr);
             va_end(arg_ptr);
-            fflush(fileout);
         }
     }
 
@@ -406,11 +405,11 @@ vector<unsigned char> ParseHex(const char* psz)
         while (isspace(*psz))
             psz++;
         char c = phexdigit[(unsigned char)*psz++];
-        if (c == -1)
+        if (c == (char)-1)
             break;
         unsigned char n = (c << 4);
         c = phexdigit[(unsigned char)*psz++];
-        if (c == -1)
+        if (c == (char)-1)
             break;
         n |= c;
         vch.push_back(n);