PHPC-1500: Store client hash in manager struct

Author: alcaeus

php_phongo.c

@@ -2548,7 +2548,7 @@ static char* php_phongo_manager_make_client_hash(const char* uri_string, zval* o
 
 	if (!EG(exception)) {
 		*hash_len = ZSTR_LEN(var_buf.s);
-		hash      = pestrndup(ZSTR_VAL(var_buf.s), *hash_len, 1);
+		hash      = estrndup(ZSTR_VAL(var_buf.s), *hash_len);
 	}
 
 	zval_ptr_dtor(&args);
@@ -2580,7 +2580,7 @@ static char* php_phongo_manager_make_client_hash(const char* uri_string, zval* o
 
 	if (!EG(exception)) {
 		*hash_len = var_buf.len;
-		hash = pestrndup(var_buf.c, *hash_len, 1);
+		hash = estrndup(var_buf.c, *hash_len);
 	}
 
 	zval_ptr_dtor(&args);
@@ -2655,21 +2655,19 @@ static mongoc_client_t* php_phongo_find_client(const char* hash, size_t hash_len
 
 void phongo_manager_init(php_phongo_manager_t* manager, const char* uri_string, zval* options, zval* driverOptions TSRMLS_DC) /* {{{ */
 {
-	char*         hash         = NULL;
-	size_t        hash_len     = 0;
 	bson_t        bson_options = BSON_INITIALIZER;
 	mongoc_uri_t* uri          = NULL;
 #ifdef MONGOC_ENABLE_SSL
 	mongoc_ssl_opt_t* ssl_opt = NULL;
 #endif
 
-	if (!(hash = php_phongo_manager_make_client_hash(uri_string, options, driverOptions, &hash_len TSRMLS_CC))) {
+	if (!(manager->client_hash = php_phongo_manager_make_client_hash(uri_string, options, driverOptions, &manager->client_hash_len TSRMLS_CC))) {
 		/* Exception should already have been thrown and there is nothing to free */
 		return;
 	}
 
-	if ((manager->client = php_phongo_find_client(hash, hash_len TSRMLS_CC))) {
-		MONGOC_DEBUG("Found client for hash: %s\n", hash);
+	if ((manager->client = php_phongo_find_client(manager->client_hash, manager->client_hash_len TSRMLS_CC))) {
+		MONGOC_DEBUG("Found client for hash: %s\n", manager->client_hash);
 		goto cleanup;
 	}
 
@@ -2733,14 +2731,10 @@ void phongo_manager_init(php_phongo_manager_t* manager, const char* uri_string,
 	}
 #endif
 
-	MONGOC_DEBUG("Created client hash: %s\n", hash);
-	php_phongo_persist_client(hash, hash_len, manager->client TSRMLS_CC);
+	MONGOC_DEBUG("Created client hash: %s\n", manager->client_hash);
+	php_phongo_persist_client(manager->client_hash, manager->client_hash_len, manager->client TSRMLS_CC);
 
 cleanup:
-	if (hash) {
-		pefree(hash, 1);
-	}
-
 	bson_destroy(&bson_options);
 
 	if (uri) {

php_phongo_structs.h

@@ -80,6 +80,8 @@ typedef struct {
 	PHONGO_ZEND_OBJECT_PRE
 	mongoc_client_t* client;
 	int              created_by_pid;
+	char*            client_hash;
+	size_t           client_hash_len;
 	PHONGO_ZEND_OBJECT_POST
 } php_phongo_manager_t;
 

src/MongoDB/Manager.c

@@ -866,6 +866,10 @@ static void php_phongo_manager_free_object(phongo_free_object_arg* object TSRMLS
 		intern->client = NULL;
 	}
 
+	if (intern->client_hash) {
+		efree(intern->client_hash);
+	}
+
 #if PHP_VERSION_ID < 70000
 	efree(intern);
 #endif