hash: Address PR comments

- Deref passed seed arg
- Don't dup args array

Signed-off-by: Anatol Belski <ab@php.net>

Author: weltling

ext/hash/hash.c

@@ -643,7 +643,12 @@ PHP_FUNCTION(hash_init)
 	hash->context = context;
 	hash->options = options;
 	hash->key = NULL;
-	hash->args = args && zend_hash_num_elements(args) > 0 ? zend_array_dup(args) : NULL;
+	if (args && zend_hash_num_elements(args)) {
+		hash->args = args;
+		GC_TRY_ADDREF(hash->args);
+	} else {
+		hash->args = NULL;
+	}
 
 	if (options & PHP_HASH_HMAC) {
 		char *K = emalloc(ops->block_size);
@@ -1389,10 +1394,7 @@ static void php_hashcontext_dtor(zend_object *obj) {
 	}
 
 	if (hash->args) {
-		if (GC_REFCOUNT(hash->args) > 1) {
-			GC_DELREF(hash->args);
-		}
-		zend_array_destroy(hash->args);
+		zend_array_release(hash->args);
 		hash->args = NULL;
 	}
 }
@@ -1487,7 +1489,7 @@ PHP_METHOD(HashContext, __serialize)
 
 	if (hash->args) {
 		ZVAL_ARR(&tmp, hash->args);
-		Z_ADDREF(tmp);
+		Z_TRY_ADDREF(tmp);
 	} else {
 		ZVAL_NULL(&tmp);
 	}
@@ -1559,7 +1561,7 @@ PHP_METHOD(HashContext, __unserialize)
 	if (args_zv && IS_ARRAY == Z_TYPE_P(args_zv) && zend_hash_num_elements(Z_ARRVAL_P(args_zv)) > 0) {
 		ops->hash_init(hash->context, Z_ARRVAL_P(args_zv));
 		hash->args = Z_ARRVAL_P(args_zv);
-		GC_ADDREF(hash->args);
+		GC_TRY_ADDREF(hash->args);
 	} else {
 		ops->hash_init(hash->context, NULL);
 		hash->args = NULL;

ext/hash/hash_murmur.c

@@ -39,10 +39,10 @@ const php_hash_ops php_hash_murmur3a_ops = {
 PHP_HASH_API void PHP_MURMUR3AInit(PHP_MURMUR3A_CTX *ctx, HashTable *args)
 {
 	if (args) {
-		zval *seed;
+		zval *seed = zend_hash_str_find_deref(args, "seed", sizeof("seed") - 1);
 		/* This might be a bit too restrictive, but thinking that a seed might be set
 			once and for all, it should be done a clean way. */
-		if ((NULL != (seed = zend_hash_str_find(args, "seed", sizeof("seed") - 1))) && IS_LONG == Z_TYPE_P(seed)) {
+		if (seed && IS_LONG == Z_TYPE_P(seed)) {
 			ctx->h = (uint32_t)Z_LVAL_P(seed);
 		} else {
 			ctx->h = 0;
@@ -96,10 +96,10 @@ const php_hash_ops php_hash_murmur3c_ops = {
 PHP_HASH_API void PHP_MURMUR3CInit(PHP_MURMUR3C_CTX *ctx, HashTable *args)
 {
 	if (args) {
-		zval *seed;
+		zval *seed = zend_hash_str_find_deref(args, "seed", sizeof("seed") - 1);
 		/* This might be a bit too restrictive, but thinking that a seed might be set
 			once and for all, it should be done a clean way. */
-		if ((NULL != (seed = zend_hash_str_find(args, "seed", sizeof("seed") - 1))) && IS_LONG == Z_TYPE_P(seed)) {
+		if (seed && IS_LONG == Z_TYPE_P(seed)) {
 			uint32_t _seed = (uint32_t)Z_LVAL_P(seed);
 			ctx->h[0] = _seed;
 			ctx->h[1] = _seed;
@@ -170,10 +170,10 @@ const php_hash_ops php_hash_murmur3f_ops = {
 PHP_HASH_API void PHP_MURMUR3FInit(PHP_MURMUR3F_CTX *ctx, HashTable *args)
 {
 	if (args) {
-		zval *seed;
+		zval *seed = zend_hash_str_find_deref(args, "seed", sizeof("seed") - 1);
 		/* This might be a bit too restrictive, but thinking that a seed might be set
 			once and for all, it should be done a clean way. */
-		if ((NULL != (seed = zend_hash_str_find(args, "seed", sizeof("seed") - 1))) && IS_LONG == Z_TYPE_P(seed)) {
+		if (seed && IS_LONG == Z_TYPE_P(seed)) {
 			uint64_t _seed = (uint64_t)Z_LVAL_P(seed);
 			ctx->h[0] = _seed;
 			ctx->h[1] = _seed;