ext/zlib: Fix nonnull warnings

Author: Girgias

ext/zlib/zlib_filter.c

@@ -321,9 +321,9 @@ static php_stream_filter *php_zlib_filter_create(const char *filtername, zval *f
 
 		if (filterparams) {
 			zval *tmpzval;
+			const HashTable *filter_params_ht = HASH_OF(filterparams);
 
-			if ((Z_TYPE_P(filterparams) == IS_ARRAY || Z_TYPE_P(filterparams) == IS_OBJECT) &&
-				(tmpzval = zend_hash_str_find(HASH_OF(filterparams), "window", sizeof("window") - 1))) {
+			if (filter_params_ht != NULL && (tmpzval = zend_hash_str_find(filter_params_ht, ZEND_STRL("window")))) {
 				/* log-2 base of history window (9 - 15) */
 				zend_long tmp = zval_get_long(tmpzval);
 				if (tmp < -MAX_WBITS || tmp > MAX_WBITS + 32) {
@@ -346,42 +346,49 @@ static php_stream_filter *php_zlib_filter_create(const char *filtername, zval *f
 
 
 		if (filterparams) {
-			zval *tmpzval;
 			zend_long tmp;
 
 			/* filterparams can either be a scalar value to indicate compression level (shortcut method)
                Or can be a hash containing one or more of 'window', 'memory', and/or 'level' members. */
 
 			switch (Z_TYPE_P(filterparams)) {
 				case IS_ARRAY:
-				case IS_OBJECT:
-					if ((tmpzval = zend_hash_str_find(HASH_OF(filterparams), "memory", sizeof("memory") -1))) {
+				case IS_OBJECT: {
+					zval *tmpzval;
+					const HashTable *filter_params_ht = HASH_OF(filterparams);
+					ZEND_ASSERT(filter_params_ht != NULL);
+
+					tmpzval = zend_hash_str_find(filter_params_ht, ZEND_STRL("memory"));
+					if (tmpzval != NULL) {
 						/* Memory Level (1 - 9) */
 						tmp = zval_get_long(tmpzval);
 						if (tmp < 1 || tmp > MAX_MEM_LEVEL) {
 							php_error_docref(NULL, E_WARNING, "Invalid parameter given for memory level (" ZEND_LONG_FMT ")", tmp);
 						} else {
-							memLevel = tmp;
+							memLevel = (int)tmp;
 						}
 					}
 
-					if ((tmpzval = zend_hash_str_find(HASH_OF(filterparams), "window", sizeof("window") - 1))) {
+					tmpzval = zend_hash_str_find(filter_params_ht, ZEND_STRL("window"));
+					if (tmpzval != NULL) {
 						/* log-2 base of history window (9 - 15) */
 						tmp = zval_get_long(tmpzval);
 						if (tmp < -MAX_WBITS || tmp > MAX_WBITS + 16) {
 							php_error_docref(NULL, E_WARNING, "Invalid parameter given for window size (" ZEND_LONG_FMT ")", tmp);
 						} else {
-							windowBits = tmp;
+							windowBits = (int)tmp;
 						}
 					}
 
-					if ((tmpzval = zend_hash_str_find(HASH_OF(filterparams), "level", sizeof("level") - 1))) {
+					tmpzval = zend_hash_str_find(filter_params_ht, ZEND_STRL("level"));
+					if (tmpzval != NULL) {
 						tmp = zval_get_long(tmpzval);
 
 						/* Pseudo pass through to catch level validating code */
 						goto factory_setlevel;
 					}
 					break;
+				}
 				case IS_STRING:
 				case IS_DOUBLE:
 				case IS_LONG: