mleku/libblkmaker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '2eb3265'

Browse Source
This commit is contained in:
Luke Dashjr
2016-07-26 03:43:17 +00:00
parent 1ba845f671 2eb326525d
commit 016aa307f5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
blkmaker_jansson.c
View File

@@ -335,7 +335,7 @@ const char *blktmpl_add_jansson(blktemplate_t *tmpl, const json_t *json, time_t
if ((v = json_object_get(json, "coinbaseaux")) && json_is_object(v)) if ((v = json_object_get(json, "coinbaseaux")) && json_is_object(v))
{ {
tmpl->aux_count = json_object_size(v); tmpl->aux_count = json_object_size(v);
tmpl->auxs = malloc(tmpl->aux_count * sizeof(*tmpl->auxs)); tmpl->auxs = calloc(tmpl->aux_count, sizeof(*tmpl->auxs));
unsigned i = 0; unsigned i = 0;
for (void *iter = json_object_iter(v); iter; (iter = json_object_iter_next(v, iter)), ++i) for (void *iter = json_object_iter(v); iter; (iter = json_object_iter_next(v, iter)), ++i)
{ {
@@ -349,7 +349,9 @@ const char *blktmpl_add_jansson(blktemplate_t *tmpl, const json_t *json, time_t
.data = malloc(sz), .data = malloc(sz),
.datasz = sz, .datasz = sz,
}; };
my_hex2bin(tmpl->auxs[i].data, s, sz); if (!my_hex2bin(tmpl->auxs[i].data, s, sz)) {
return "Error decoding 'coinbaseaux' data";
}
} }
} }