Merge branch '0.4.x' into 0.5.x

This commit is contained in:
Luke Dashjr 2016-12-01 23:30:13 +00:00
commit 835ed46634

View File

@ -136,8 +136,10 @@ uint64_t blkmk_init_generation3(blktemplate_t * const tmpl, const void * const s
my_htole64(&data[off], tmpl->cbvalue);
off += 8;
data[off++] = scriptsz;
memcpy(&data[off], script, scriptsz);
off += scriptsz;
if (scriptsz) {
memcpy(&data[off], script, scriptsz);
off += scriptsz;
}
memset(&data[off], 0, 4); // lock time
off += 4;