Merge pull request #153 from WOnder93/master

sneves · web-flow · commit f87df8aaf85c · 2016-08-20T16:52:24.000+01:00
Fix bad pointer copy when using custom allocator
diff --git a/src/core.c b/src/core.c
@@ -575,7 +575,7 @@ int initialize(argon2_instance_t *instance, argon2_context *context) {
         if (ARGON2_OK != result) {
             return result;
         }
-        memcpy(&(instance->memory), p, sizeof(instance->memory));
+        instance->memory = (block *)p;
     } else {
         result = allocate_memory(&(instance->memory), instance->memory_blocks);
         if (ARGON2_OK != result) {

Original file line number	Diff line number	Diff line change
`@@ -575,7 +575,7 @@ int initialize(argon2_instance_t instance, argon2_context context) {`
`575`	`575`	`if (ARGON2_OK != result) {`
`576`	`576`	`return result;`
`577`	`577`	`}`
`578`		`- memcpy(&(instance->memory), p, sizeof(instance->memory));`
	`578`	`+ instance->memory = (block *)p;`
`579`	`579`	`} else {`
`580`	`580`	`result = allocate_memory(&(instance->memory), instance->memory_blocks);`
`581`	`581`	`if (ARGON2_OK != result) {`