Skip to content
Permalink
Browse files

-- version 0.3.18 release

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@198 1a98c847-1fd6-4fd8-948a-caf3550aa51b
  • Loading branch information...
non-github-bitcoin committed Dec 8, 2010
1 parent a206a23 commit 82201801336f64ee77851b9eaab9383ee4e442f0
Showing with 9 additions and 8 deletions.
  1. +1 −1 script.cpp
  2. +2 −0 script.h
  3. +1 −1 serialize.h
  4. +3 −3 setup.nsi
  5. +2 −3 util.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));
}
@@ -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())
{
@@ -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 = "";


@@ -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}"
@@ -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);

0 comments on commit 8220180

Please sign in to comment.
You can’t perform that action at this time.