Merge branch '0.2.x' into 0.3.x

2014-09-01 20:34:08 +00:00
parent fe5717762a d7ce09ca03
commit 856f5b0d13
1 changed files with 3 additions and 0 deletions
--- a/blkmaker.c
+++ b/blkmaker.c
@@ -52,6 +52,9 @@ uint64_t blkmk_init_generation2(blktemplate_t *tmpl, void *script, size_t script
 	if (out_newcb)
 		*out_newcb = true;
 	
+	if (scriptsz >= 0xfd)
+		return 0;
+	
 	size_t datasz = 62 + sizeof(blkheight_t) + scriptsz;
 	unsigned char *data = malloc(datasz);
 	size_t off = 0;