diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-15 21:15:48 -0400 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-15 21:15:48 -0400 |
| commit | 3374c3ef094b328e6c6957fdaf5a9abff0c53a33 (patch) | |
| tree | 2c31367efc456d8a77d235be53612190e184b554 /src/uint256.h | |
| parent | 1bdfa94a0164f73b453633861b91c67bb6bf10d8 (diff) | |
| parent | e73b792b1af9d9d747bac81a27d16020ed393905 (diff) | |
| download | bitcoin-3374c3ef094b328e6c6957fdaf5a9abff0c53a33.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/qt/bitcoin.cpp
src/qt/bitcoingui.cpp
src/qt/guiutil.cpp
src/qt/guiutil.h
src/qt/sendcoinsdialog.cpp
src/qt/sendcoinsdialog.h
src/util.cpp
Diffstat (limited to 'src/uint256.h')
| -rw-r--r-- | src/uint256.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/uint256.h b/src/uint256.h index cfc2eb128e..0947816785 100644 --- a/src/uint256.h +++ b/src/uint256.h @@ -308,7 +308,7 @@ public: // hex string to uint static char phexdigit[256] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,1,2,3,4,5,6,7,8,9,0,0,0,0,0,0, 0,0xa,0xb,0xc,0xd,0xe,0xf,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0xa,0xb,0xc,0xd,0xe,0xf,0,0,0,0,0,0,0,0,0 }; const char* pbegin = psz; - while (phexdigit[*psz] || *psz == '0') + while (phexdigit[(unsigned char)*psz] || *psz == '0') psz++; psz--; unsigned char* p1 = (unsigned char*)pn; |