Skip to content

PHPC-629: Resolve mongoc-cursor-cursorid memory leaks #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 18, 2016
Merged

PHPC-629: Resolve mongoc-cursor-cursorid memory leaks #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f03277
PHPC-629: Upgrade libbson and libmongoc to 1.4.0-dev
jmikola Apr 12, 2016
912a6e2
PHPC-629: Update build configs for libmongoc Secure Channel
jmikola Apr 12, 2016
38f7d67
PHPC-609: Free mongoc_uri_t if RC/RP/WC application fails
jmikola Apr 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,27 +287,28 @@ if test "$MONGODB" != "no"; then
mongoc-ssl.c
";

MONGOC_SOURCES_LIBCRYPTO="\
mongoc-crypto-openssl.c \
mongoc-rand-openssl.c
";

MONGOC_SOURCES_OPENSSL="\
mongoc-crypto-openssl.c \
mongoc-openssl.c \
mongoc-rand-openssl.c \
mongoc-stream-tls-openssl.c \
mongoc-stream-tls-openssl-bio.c
";

MONGOC_SOURCES_COMMON_CRYPTO="\
mongoc-crypto-common-crypto.c \
mongoc-rand-common-crypto.c
";

MONGOC_SOURCES_SECURE_TRANSPORT="\
mongoc-crypto-common-crypto.c \
mongoc-rand-common-crypto.c \
mongoc-secure-transport.c \
mongoc-stream-tls-secure-transport.c
";

MONGOC_SOURCES_SECURE_CHANNEL="\
mongoc-crypto-cng.c \
mongoc-rand-cng.c \
mongoc-secure-channel.c \
mongoc-stream-tls-secure-channel.c
";

MONGOC_SOURCES_SASL=mongoc-sasl.c

if test "$ext_shared" = "no"; then
Expand Down Expand Up @@ -385,10 +386,9 @@ PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES, [$STD_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_CRYPTO, [$STD_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SSL, [$STD_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_LIBCRYPTO, [$STD_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_OPENSSL, [$STD_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_COMMON_CRYPTO, [$STD_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SECURE_TRANSPORT, [$STD_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SECURE_CHANNEL, [$STD_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SASL, [$STD_CFLAGS], shared_objects_mongodb, yes)


Expand All @@ -402,6 +402,10 @@ PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
AC_SUBST(MONGOC_ENABLE_SECURE_TRANSPORT, 0)
AC_SUBST(MONGOC_ENABLE_COMMON_CRYPTO, 0)

dnl Secure Channel only applies to Windows
AC_SUBST(MONGOC_ENABLE_SECURE_CHANNEL, 0)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apologize upfront. This will be renamed very soon.

MONGOC_ENABLE_SSL_SECURE_CHANNEL
MONGOC_ENABLE_SSL_SECURE_TRANSPORT
MONGOC_ENABLE_SSL_OPENSSL

same with crypto
MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO
MONGOC_ENABLE_CRYPTO_CNG
MONGOC_ENABLE_CRYPTO_LIBCRYPTO

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem. Thanks for the heads up!

I started this PR before realizing that only libbson was updated. I'll revisit once the upstream ticket is resolved in libmongoc.

AC_SUBST(MONGOC_ENABLE_CRYPTO_CNG, 0)

AC_SUBST(MONGOC_NO_AUTOMATIC_GLOBALS, 1)
fi

Expand Down
6 changes: 6 additions & 0 deletions config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ if (PHP_MONGODB != "no") {
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-openssl.c mongoc-stream-tls-openssl.c mongoc-stream-tls-openssl-bio.c", "mongodb");
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-crypto-common-crypto.c mongoc-rand-common-crypto.c", "mongodb");
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-secure-transport.c mongoc-stream-tls-secure-transport.c", "mongodb");
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-crypto-cng.c mongoc-rand-cng.c", "mongodb");
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-secure-channel.c mongoc-stream-tls-secure-channel.c", "mongodb");
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-sasl.c", "mongodb");

AC_DEFINE("HAVE_MONGOC", 1);
Expand Down Expand Up @@ -54,6 +56,10 @@ if (PHP_MONGODB != "no") {
AC_DEFINE("MONGOC_ENABLE_SECURE_TRANSPORT", 0);
AC_DEFINE("MONGOC_ENABLE_COMMON_CRYPTO", 0);

// TODO: Support building with Secure Channel on Windows
AC_DEFINE("MONGOC_ENABLE_SECURE_CHANNEL", 0)
AC_DEFINE("MONGOC_ENABLE_CRYPTO_CNG", 0)

if (PHP_MONGODB_SASL != "no" &&
CHECK_LIB("libsasl.lib", "mongodb", PHP_MONGODB) &&
CHECK_HEADER_ADD_INCLUDE("sasl/sasl.h", "CFLAGS_MONGOC")) {
Expand Down
1 change: 1 addition & 0 deletions php_phongo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1989,6 +1989,7 @@ bool phongo_manager_init(php_phongo_manager_t *manager, const char *uri_string,
!php_phongo_apply_rp_options_to_uri(uri, bson_options TSRMLS_CC) ||
!php_phongo_apply_wc_options_to_uri(uri, bson_options TSRMLS_CC)) {
/* Exception should already have been thrown */
mongoc_uri_destroy(uri);
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion src/libbson
Open in desktop
Submodule libbson updated 23 files
+0 −259 .mci.yml
+3 −0 CMakeLists.txt
+4 −1 NEWS
+5 −0 build/autotools/versions.ldscript
+1 −0 build/cmake/libbson.def
+1 −1 doc/bson_append_dbpointer.page
+2 −1 doc/bson_destroy_with_steal.page
+1 −1 doc/bson_iter_date_time.page
+85 −0 doc/bson_steal.page
+1 −1 doc/bson_streaming_bson.page
+1 −1 src/bson/bson-decimal128.c
+0 −2 src/bson/bson-error.h
+2 −1 src/bson/bson-types.h
+44 −0 src/bson/bson.c
+5 −0 src/bson/bson.h
+1 −0 src/libbson.symbols
+1 −1 tests/Makefile.am
+14 −6 tests/json/type/boolean.json
+132 −143 tests/json/type/decimal128.json
+8 −16 tests/json/type/int32.json
+85 −0 tests/test-bson.c
+2 −2 tests/test-decimal128.c
+133 −97 tests/test-type.c
2 changes: 1 addition & 1 deletion src/libmongoc
Open in desktop
Submodule libmongoc updated 104 files