-- version 0.3.18 release

non-github-bitcoin · non-github-bitcoin · commit 82201801336f · 2010-12-08T23:23:48.000Z
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@198 1a98c847-1fd6-4fd8-948a-caf3550aa51b
diff --git 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
@@ -599,6 +599,8 @@ class CScript : public vector<unsigned char>
 
     bool IsPushOnly() const
     {
+        if (size() > 200)
+            return false;
         const_iterator pc = begin();
         while (pc < end())
         {
diff --git 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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -997,7 +997,7 @@ bool Solver(const CScript& scriptPubKey, vector<pair<opcodetype, valtype> >& vSo`
`997`	`997`	`break;`
`998`	`998`	`if (opcode2 == OP_PUBKEY)`
`999`	`999`	`{`
`1000`		`- if (vch1.size() < 33)`
	`1000`	`+ if (vch1.size() < 33 \|\| vch1.size() > 120)`
`1001`	`1001`	`break;`
`1002`	`1002`	`vSolutionRet.push_back(make_pair(opcode2, vch1));`
`1003`	`1003`	`}`
Original file line number	Diff line number	Diff line change
`@@ -599,6 +599,8 @@ class CScript : public vector<unsigned char>`
`599`	`599`
`600`	`600`	`bool IsPushOnly() const`
`601`	`601`	`{`
	`602`	`+ if (size() > 200)`
	`603`	`+ return false;`
`602`	`604`	`const_iterator pc = begin();`
`603`	`605`	`while (pc < end())`
`604`	`606`	`{`