GOSTSec
/
sgminer
mirror of https://github.com/GOSTSec/sgminer
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Make all buffers slightly larger to prevent overflow.

nfactor-troky
Con Kolivas 12 years ago
parent
bbb092e0da
commit
78aafcec5c
1 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      cgminer.c

14
cgminer.c
Unescape View File

@ -1929,7 +1929,7 @@ static bool submit_upstream_work(const struct work *work, CURL *curl, bool resub
int rolltime; int rolltime;
uint32_t *hash32; uint32_t *hash32;
struct timeval tv_submit, tv_submit_reply; struct timeval tv_submit, tv_submit_reply;
char hashshow[64 +1 ] = ""; char hashshow[64 + 1] = "";
char worktime[200] = ""; char worktime[200] = "";
#ifdef __BIG_ENDIAN__ #ifdef __BIG_ENDIAN__
@ -4465,7 +4465,7 @@ static struct work *clone_work(struct work *work)
static void gen_hash(unsigned char *data, unsigned char *hash, int len) static void gen_hash(unsigned char *data, unsigned char *hash, int len)
{ {
unsigned char hash1[32]; unsigned char hash1[33];
sha2(data, len, hash1, false); sha2(data, len, hash1, false);
sha2(hash1, 32, hash, false); sha2(hash1, 32, hash, false);
@ -4473,11 +4473,11 @@ static void gen_hash(unsigned char *data, unsigned char *hash, int len)
static void gen_stratum_work(struct pool *pool, struct work *work) static void gen_stratum_work(struct pool *pool, struct work *work)
{ {
char header[256], hash1[128], *nonce2, *buf; char header[257], hash1[129], *nonce2, *buf;
unsigned char *coinbase, merkle_root[32], merkle_sha[64], *merkle_hash; unsigned char *coinbase, merkle_root[33], merkle_sha[65], *merkle_hash;
uint32_t *data32, *swap32; uint32_t *data32, *swap32;
uint64_t diff, diff64; uint64_t diff, diff64;
char target[64]; char target[65];
int len, cb1_len, n1_len, cb2_len, i; int len, cb1_len, n1_len, cb2_len, i;
mutex_lock(&pool->pool_lock); mutex_lock(&pool->pool_lock);
@ -4491,7 +4491,7 @@ static void gen_stratum_work(struct pool *pool, struct work *work)
n1_len = strlen(pool->nonce1) / 2; n1_len = strlen(pool->nonce1) / 2;
cb2_len = strlen(pool->swork.coinbase2) / 2; cb2_len = strlen(pool->swork.coinbase2) / 2;
len = cb1_len + n1_len + pool->n2size + cb2_len; len = cb1_len + n1_len + pool->n2size + cb2_len;
coinbase = alloca(len); coinbase = alloca(len + 1);
hex2bin(coinbase, pool->swork.coinbase1, cb1_len); hex2bin(coinbase, pool->swork.coinbase1, cb1_len);
hex2bin(coinbase + cb1_len, pool->nonce1, n1_len); hex2bin(coinbase + cb1_len, pool->nonce1, n1_len);
hex2bin(coinbase + cb1_len + n1_len, nonce2, pool->n2size); hex2bin(coinbase + cb1_len + n1_len, nonce2, pool->n2size);
@ -4501,7 +4501,7 @@ static void gen_stratum_work(struct pool *pool, struct work *work)
gen_hash(coinbase, merkle_root, len); gen_hash(coinbase, merkle_root, len);
memcpy(merkle_sha, merkle_root, 32); memcpy(merkle_sha, merkle_root, 32);
for (i = 0; i < pool->swork.merkles; i++) { for (i = 0; i < pool->swork.merkles; i++) {
unsigned char merkle_bin[32]; unsigned char merkle_bin[33];
hex2bin(merkle_bin, pool->swork.merkle[i], 32); hex2bin(merkle_bin, pool->swork.merkle[i], 32);
memcpy(merkle_sha + 32, merkle_bin, 32); memcpy(merkle_sha + 32, merkle_bin, 32);

Write Preview
Loading…
Cancel
Save