Mercurial > hg > bitcoin
changeset 317:49ad10c2682f draft
-- version 0.3.18 release
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@198 1a98c847-1fd6-4fd8-948a-caf3550aa51b
| author | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> |
|---|---|
| date | Wed, 08 Dec 2010 23:23:48 +0000 |
| parents | 69a0155a14cd |
| children | 87b3b19407e4 de1d4056a8ed |
| files | script.cpp script.h serialize.h setup.nsi util.cpp |
| diffstat | 5 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/script.cpp +++ b/script.cpp @@ -997,7 +997,7 @@ break; if (opcode2 == OP_PUBKEY) { - if (vch1.size() < 33) + if (vch1.size() < 33 || vch1.size() > 120) break; vSolutionRet.push_back(make_pair(opcode2, vch1)); }
--- a/script.h +++ b/script.h @@ -599,6 +599,8 @@ bool IsPushOnly() const { + if (size() > 200) + return false; const_iterator pc = begin(); while (pc < end()) {
--- a/serialize.h +++ b/serialize.h @@ -25,7 +25,7 @@ class CAutoFile; static const unsigned int MAX_SIZE = 0x02000000; -static const int VERSION = 31705; +static const int VERSION = 31800; static const char* pszSubVer = "";
--- a/setup.nsi +++ b/setup.nsi @@ -7,7 +7,7 @@ # 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 @@ !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}"
--- a/util.cpp +++ b/util.cpp @@ -175,7 +175,6 @@ va_start(arg_ptr, pszFormat); ret = vfprintf(fileout, pszFormat, arg_ptr); va_end(arg_ptr); - fflush(fileout); } } @@ -406,11 +405,11 @@ 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);