BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

-- version 0.3.18 release 

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@198 1a98c847-1fd6-4fd8-948a-caf3550aa51b
This commit is contained in:
s_nakamoto 2010-12-08 23:23:48 +00:00
parent a206a23980
commit 8220180133
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
script.cpp
View File

@ -997,7 +997,7 @@ bool Solver(const CScript& scriptPubKey, vector<pair<opcodetype, valtype> >& vSo
break; break;
if (opcode2 == OP_PUBKEY) if (opcode2 == OP_PUBKEY)
{ {
if (vch1.size() < 33) if (vch1.size() < 33 || vch1.size() > 120)
break; break;
vSolutionRet.push_back(make_pair(opcode2, vch1)); vSolutionRet.push_back(make_pair(opcode2, vch1));
} }

2
script.h
View File

@ -599,6 +599,8 @@ public:
bool IsPushOnly() const bool IsPushOnly() const
{ {
if (size() > 200)
return false;
const_iterator pc = begin(); const_iterator pc = begin();
while (pc < end()) while (pc < end())
{ {

2
serialize.h
View File

@ -25,7 +25,7 @@ class CDataStream;
class CAutoFile; class CAutoFile;
static const unsigned int MAX_SIZE = 0x02000000; static const unsigned int MAX_SIZE = 0x02000000;
static const int VERSION = 31705; static const int VERSION = 31800;
static const char* pszSubVer = ""; static const char* pszSubVer = "";

6
setup.nsi
View File

@ -7,7 +7,7 @@ RequestExecutionLevel highest
# General Symbol Definitions # General Symbol Definitions
!define REGKEY "SOFTWARE\$(^Name)" !define REGKEY "SOFTWARE\$(^Name)"
!define VERSION 0.3.17 !define VERSION 0.3.18
!define COMPANY "Bitcoin project" !define COMPANY "Bitcoin project"
!define URL http://www.bitcoin.org/ !define URL http://www.bitcoin.org/
@ -42,12 +42,12 @@ Var StartMenuGroup
!insertmacro MUI_LANGUAGE English !insertmacro MUI_LANGUAGE English
# Installer attributes # Installer attributes
OutFile bitcoin-0.3.17-win32-setup.exe OutFile bitcoin-0.3.18-win32-setup.exe
InstallDir $PROGRAMFILES\Bitcoin InstallDir $PROGRAMFILES\Bitcoin
CRCCheck on CRCCheck on
XPStyle on XPStyle on
ShowInstDetails show ShowInstDetails show
VIProductVersion 0.3.17.0 VIProductVersion 0.3.18.0
VIAddVersionKey ProductName Bitcoin VIAddVersionKey ProductName Bitcoin
VIAddVersionKey ProductVersion "${VERSION}" VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}" VIAddVersionKey CompanyName "${COMPANY}"

5
util.cpp
View File

@ -175,7 +175,6 @@ inline int OutputDebugStringF(const char* pszFormat, ...)
va_start(arg_ptr, pszFormat); va_start(arg_ptr, pszFormat);
ret = vfprintf(fileout, pszFormat, arg_ptr); ret = vfprintf(fileout, pszFormat, arg_ptr);
va_end(arg_ptr); va_end(arg_ptr);
fflush(fileout);
} }
} }
@ -406,11 +405,11 @@ vector<unsigned char> ParseHex(const char* psz)
while (isspace(*psz)) while (isspace(*psz))
psz++; psz++;
char c = phexdigit[(unsigned char)*psz++]; char c = phexdigit[(unsigned char)*psz++];
if (c == -1) if (c == (char)-1)
break; break;
unsigned char n = (c << 4); unsigned char n = (c << 4);
c = phexdigit[(unsigned char)*psz++]; c = phexdigit[(unsigned char)*psz++];
if (c == -1) if (c == (char)-1)
break; break;
n |= c; n |= c;
vch.push_back(n); vch.push_back(n);