PHPC-2038: Init zval in phongo_clientencryption_init (#1303)

Author: jmikola

src/MongoDB/ClientEncryption.c

@@ -296,9 +296,10 @@ static mongoc_client_encryption_opts_t* phongo_clientencryption_opts_from_zval(z
 	return NULL;
 } /* }}} */
 
-void phongo_clientencryption_init(php_phongo_clientencryption_t* clientencryption, zval* manager, zval* options) /* {{{ */
+void phongo_clientencryption_init(zval* return_value, zval* manager, zval* options) /* {{{ */
 {
-	mongoc_client_encryption_t*      ce;
+	php_phongo_clientencryption_t*   intern;
+	mongoc_client_encryption_t*      client_encryption;
 	mongoc_client_encryption_opts_t* opts;
 	zval*                            key_vault_client_manager = manager;
 	bson_error_t                     error                    = { 0 };
@@ -309,15 +310,18 @@ void phongo_clientencryption_init(php_phongo_clientencryption_t* clientencryptio
 		goto cleanup;
 	}
 
-	ce = mongoc_client_encryption_new(opts, &error);
-	if (!ce) {
+	client_encryption = mongoc_client_encryption_new(opts, &error);
+	if (!client_encryption) {
 		phongo_throw_exception_from_bson_error_t(&error);
 
 		goto cleanup;
 	}
 
-	clientencryption->client_encryption = ce;
-	ZVAL_ZVAL(&clientencryption->key_vault_client_manager, key_vault_client_manager, 1, 0);
+	object_init_ex(return_value, php_phongo_clientencryption_ce);
+
+	intern                    = Z_CLIENTENCRYPTION_OBJ_P(return_value);
+	intern->client_encryption = client_encryption;
+	ZVAL_ZVAL(&intern->key_vault_client_manager, key_vault_client_manager, 1, 0);
 
 cleanup:
 	if (opts) {

src/MongoDB/ClientEncryption.h

@@ -19,8 +19,6 @@
 
 #include <php.h>
 
-#include "php_phongo.h"
-
-void phongo_clientencryption_init(php_phongo_clientencryption_t* ce_obj, zval* manager, zval* options);
+void phongo_clientencryption_init(zval* return_value, zval* manager, zval* options);
 
 #endif /* PHONGO_CLIENTENCRYPTION_H */

src/MongoDB/Manager.c

@@ -311,10 +311,8 @@ static PHP_METHOD(Manager, addSubscriber)
    Return a ClientEncryption instance */
 static PHP_METHOD(Manager, createClientEncryption)
 {
-	zend_error_handling            error_handling;
-	php_phongo_manager_t*          intern;
-	php_phongo_clientencryption_t* clientencryption;
-	zval*                          options;
+	zend_error_handling error_handling;
+	zval*               options;
 
 	zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling);
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "a", &options) == FAILURE) {
@@ -323,13 +321,8 @@ static PHP_METHOD(Manager, createClientEncryption)
 	}
 	zend_restore_error_handling(&error_handling);
 
-	intern = Z_MANAGER_OBJ_P(getThis());
-
-	object_init_ex(return_value, php_phongo_clientencryption_ce);
-	clientencryption = Z_CLIENTENCRYPTION_OBJ_P(return_value);
-
 	/* An exception will be thrown on error. */
-	phongo_clientencryption_init(clientencryption, getThis(), options);
+	phongo_clientencryption_init(return_value, getThis(), options);
 } /* }}} */
 
 /* {{{ proto MongoDB\Driver\Cursor MongoDB\Driver\Manager::executeCommand(string $db, MongoDB\Driver\Command $command[, array $options = null])