Merge branch '0.2.x' (early part) into 0.3.x

2014-01-19 04:44:36 +00:00
parent 4282562adf 0b052e37a7
commit 11284db136
1 changed files with 2 additions and 1 deletions
--- a/blkmaker_jansson.c
+++ b/blkmaker_jansson.c
@@ -284,7 +284,8 @@ static
 json_t *_blkmk_submit_jansson(blktemplate_t *tmpl, const unsigned char *data, unsigned int dataid, blknonce_t nonce, bool foreign) {
 	unsigned char blk[80 + 8 + 1000000];
 	memcpy(blk, data, 76);
-	*(uint32_t*)(&blk[76]) = htonl(nonce);
+	nonce = htonl(nonce);
+	memcpy(&blk[76], &nonce, 4);
 	size_t offs = 80;
 	
 	if (foreign || (!(tmpl->mutations & BMAb_TRUNCATE && !dataid)))