Use emalloc() for hash_hkdf() salt

narfbg · narfbg · commit 6589b58de991 · 2015-02-26T12:22:29.000+02:00
diff --git a/ext/hash/hash.c b/ext/hash/hash.c
@@ -646,11 +646,11 @@ PHP_FUNCTION(hash_hkdf)
 	}
 
 	if (salt != NULL && salt->len > 0) {
-		computed_salt = safe_emalloc(salt->len, salt->len, 0);
+		computed_salt = emalloc(salt->len);
 		memcpy(computed_salt, salt->val, salt->len);
 	}
 	else {
-		computed_salt = safe_emalloc(ops->digest_size, ops->digest_size, 0);
+		computed_salt = emalloc(ops->digest_size);
 		for (i = 0; i < ops->digest_size; i++)
 		{
 			computed_salt[i] = 0x00;

Original file line number	Diff line number	Diff line change
`@@ -646,11 +646,11 @@ PHP_FUNCTION(hash_hkdf)`
`646`	`646`	`}`
`647`	`647`
`648`	`648`	`if (salt != NULL && salt->len > 0) {`
`649`		`- computed_salt = safe_emalloc(salt->len, salt->len, 0);`
	`649`	`+ computed_salt = emalloc(salt->len);`
`650`	`650`	`memcpy(computed_salt, salt->val, salt->len);`
`651`	`651`	`}`
`652`	`652`	`else {`
`653`		`- computed_salt = safe_emalloc(ops->digest_size, ops->digest_size, 0);`
	`653`	`+ computed_salt = emalloc(ops->digest_size);`
`654`	`654`	`for (i = 0; i < ops->digest_size; i++)`
`655`	`655`	`{`
`656`	`656`	`computed_salt[i] = 0x00;`