Merge branch 'v1.1'

Author: jmikola

php_phongo.c

@@ -1870,7 +1870,7 @@ static bool php_phongo_apply_wc_options_to_uri(mongoc_uri_t *uri, bson_t *option
 	return true;
 } /* }}} */
 
-static mongoc_client_t *php_phongo_make_mongo_client(const mongoc_uri_t *uri, zval *driverOptions TSRMLS_DC) /* {{{ */
+static mongoc_client_t *php_phongo_make_mongo_client(php_phongo_manager_t *manager, const mongoc_uri_t *uri, zval *driverOptions TSRMLS_DC) /* {{{ */
 {
 #if PHP_VERSION_ID >= 70000
 	zval                      *tmp;
@@ -1954,21 +1954,23 @@ static mongoc_client_t *php_phongo_make_mongo_client(const mongoc_uri_t *uri, zv
 
 #if PHP_VERSION_ID >= 70000
 		if ((pem = php_stream_context_get_option(ctx, "ssl", "local_cert")) != NULL) {
+			zend_string *s = zval_get_string(pem);
 #else
 		if (SUCCESS == php_stream_context_get_option(ctx, "ssl", "local_cert", &pem)) {
+			convert_to_string_ex(pem);
 #endif
-			char filename[MAXPATHLEN];
+			/* mongoc_client_set_ssl_opts() copies mongoc_ssl_opt_t shallowly;
+			 * its strings must be kept valid for the life of mongoc_client_t */
+			manager->pem_file = ecalloc(1, MAXPATHLEN);
 
 #if PHP_VERSION_ID >= 70000
-			zend_string *s = zval_get_string(pem);
-			if (VCWD_REALPATH(ZSTR_VAL(s), filename)) {
+			if (VCWD_REALPATH(ZSTR_VAL(s), manager->pem_file)) {
 #else
-			convert_to_string_ex(pem);
-			if (VCWD_REALPATH(Z_STRVAL_PP(pem), filename)) {
+			if (VCWD_REALPATH(Z_STRVAL_PP(pem), manager->pem_file)) {
 #endif
-				mongoc_ssl_opt_t  ssl_options;
+				mongoc_ssl_opt_t ssl_options = {0};
 
-				ssl_options.pem_file = filename;
+				ssl_options.pem_file = manager->pem_file;
 				mongoc_client_set_ssl_opts(client, &ssl_options);
 			}
 #if PHP_VERSION_ID >= 70000
@@ -1999,7 +2001,7 @@ bool phongo_manager_init(php_phongo_manager_t *manager, const char *uri_string,
 		return false;
 	}
 
-	manager->client = php_phongo_make_mongo_client(uri, driverOptions TSRMLS_CC);
+	manager->client = php_phongo_make_mongo_client(manager, uri, driverOptions TSRMLS_CC);
 	mongoc_uri_destroy(uri);
 
 	if (!manager->client) {

php_phongo_structs-5.h

@@ -54,6 +54,7 @@ typedef struct {
 typedef struct {
 	zend_object              std;
 	mongoc_client_t         *client;
+	char                    *pem_file;
 } php_phongo_manager_t;
 
 typedef struct {

php_phongo_structs-7.h

@@ -53,6 +53,7 @@ typedef struct {
 
 typedef struct {
 	mongoc_client_t         *client;
+	char                    *pem_file;
 	zend_object              std;
 } php_phongo_manager_t;
 

src/MongoDB/Manager.c

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