Merge branch '0.3.x' into 0.4.x

2014-09-01 20:34:15 +00:00
parent e407661000 856f5b0d13
commit 136a8ee229
1 changed files with 3 additions and 0 deletions
--- a/blkmaker.c
+++ b/blkmaker.c
@@ -50,6 +50,9 @@ uint64_t blkmk_init_generation3(blktemplate_t * const tmpl, const void * const s
 	
 	*inout_newcb = true;
 	
+	if (scriptsz >= 0xfd)
+		return 0;
+	
 	size_t datasz = 62 + sizeof(blkheight_t) + scriptsz;
 	unsigned char *data = malloc(datasz);
 	size_t off = 0;