You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2018/09/07 13:56:46 UTC
[1/3] qpid-proton git commit: PROTON-1798: [c] Fix leaks in tools/*.c,
found by asan.
Repository: qpid-proton
Updated Branches:
refs/heads/master a1b7d502a -> 407711aac
PROTON-1798: [c] Fix leaks in tools/*.c, found by asan.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/0da413e6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/0da413e6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/0da413e6
Branch: refs/heads/master
Commit: 0da413e6f5e8e0c3dbdf0db615336482460a6d5e
Parents: 6275c98
Author: Alan Conway <ac...@redhat.com>
Authored: Thu Sep 6 17:46:32 2018 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Fri Sep 7 09:45:50 2018 -0400
----------------------------------------------------------------------
c/tools/msgr-recv.c | 1 +
c/tools/msgr-send.c | 1 +
c/tools/reactor-send.c | 1 +
3 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/0da413e6/c/tools/msgr-recv.c
----------------------------------------------------------------------
diff --git a/c/tools/msgr-recv.c b/c/tools/msgr-recv.c
index 729a8f8..3b2a24e 100644
--- a/c/tools/msgr-recv.c
+++ b/c/tools/msgr-recv.c
@@ -181,6 +181,7 @@ int main(int argc, char** argv)
if (opts.password) {
rc = pn_messenger_set_password(messenger, opts.password);
+ free(opts.password);
check_messenger(messenger);
check( rc == 0, "Failed to set password" );
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/0da413e6/c/tools/msgr-send.c
----------------------------------------------------------------------
diff --git a/c/tools/msgr-send.c b/c/tools/msgr-send.c
index 75b5931..d4299cf 100644
--- a/c/tools/msgr-send.c
+++ b/c/tools/msgr-send.c
@@ -212,6 +212,7 @@ int main(int argc, char** argv)
if (opts.password) {
rc = pn_messenger_set_password(messenger, opts.password);
+ free(opts.password);
check( rc == 0, "Failed to set password" );
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/0da413e6/c/tools/reactor-send.c
----------------------------------------------------------------------
diff --git a/c/tools/reactor-send.c b/c/tools/reactor-send.c
index f182193..1b7870f 100644
--- a/c/tools/reactor-send.c
+++ b/c/tools/reactor-send.c
@@ -414,6 +414,7 @@ int main(int argc, char** argv)
pn_handler_free(sh);
addresses_free(&opts.targets);
+ free(opts.password);
return 0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/3] qpid-proton git commit: PROTON-1928: install static libraries
Posted by ac...@apache.org.
PROTON-1928: install static libraries
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/407711aa
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/407711aa
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/407711aa
Branch: refs/heads/master
Commit: 407711aacf377a9b576adcd3f12d5f5242c4bf2a
Parents: 0da413e
Author: Alan Conway <ac...@redhat.com>
Authored: Fri Sep 7 09:56:26 2018 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Fri Sep 7 09:56:26 2018 -0400
----------------------------------------------------------------------
c/CMakeLists.txt | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/407711aa/c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/c/CMakeLists.txt b/c/CMakeLists.txt
index da68c4f..a16f46b 100644
--- a/c/CMakeLists.txt
+++ b/c/CMakeLists.txt
@@ -515,7 +515,10 @@ if (qpid-proton-proactor)
endif()
# Install executables and libraries
-install(TARGETS qpid-proton qpid-proton-core
+if (BUILD_STATIC_LIBS)
+ set(STATIC_LIBS qpid-proton-static qpid-proton-core-static)
+endif()
+install(TARGETS qpid-proton qpid-proton-core ${STATIC_LIBS}
EXPORT proton
RUNTIME DESTINATION bin
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
@@ -532,7 +535,10 @@ if (MSVC)
endif (MSVC)
if (HAS_PROACTOR)
- install(TARGETS qpid-proton-proactor
+ if (BUILD_STATIC_LIBS)
+ set(STATIC_LIBS qpid-proton-proactor-static)
+ endif()
+ install(TARGETS qpid-proton-proactor ${STATIC_LIBS}
EXPORT proton
RUNTIME DESTINATION bin
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/3] qpid-proton git commit: PROTON-1798: [ruby] Use CMAKE_C_FLAGS
to build ruby module
Posted by ac...@apache.org.
PROTON-1798: [ruby] Use CMAKE_C_FLAGS to build ruby module
Don't overwrite CMAKE_C_FLAGS when building ruby SWIG modules,
just remove the troublesome -fvisibility=* but keep the rest.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/6275c986
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/6275c986
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/6275c986
Branch: refs/heads/master
Commit: 6275c986902fe2d16cefb1ae860f1d8af3caacd1
Parents: a1b7d50
Author: Alan Conway <ac...@redhat.com>
Authored: Thu Sep 6 16:57:41 2018 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Fri Sep 7 09:45:50 2018 -0400
----------------------------------------------------------------------
ruby/CMakeLists.txt | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/6275c986/ruby/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/ruby/CMakeLists.txt b/ruby/CMakeLists.txt
index 848d1c9..e205250 100644
--- a/ruby/CMakeLists.txt
+++ b/ruby/CMakeLists.txt
@@ -41,12 +41,13 @@ swig_link_libraries(cproton-ruby ${BINDING_DEPS} ${RUBY_LIBRARY})
if (RUBY_VERSION VERSION_LESS 1.9.0)
# Don't have blocking control API
elseif(RUBY_VERSION VERSION_LESS 2.0.0)
- set(RUBY_C_FLAGS "-DRUBY_USE_rb_thread_blocking_region")
+ string(APPEND CMAKE_C_FLAGS " -DRUBY_USE_rb_thread_blocking_region")
else()
- set(RUBY_C_FLAGS "-DRUBY_USE_rb_thread_call_without_gvl")
+ string(APPEND CMAKE_C_FLAGS " -DRUBY_USE_rb_thread_call_without_gvl")
endif()
-# Replace global CMAKE_C_FLAGS, -fvisibility=hidden causes an obscure failure with release builds.
-set(CMAKE_C_FLAGS "${RUBY_C_FLAGS}")
+
+# Remove -fvisibility=hidden, it causes an obscure failure in release builds.
+string(REGEX REPLACE "-fvisibility=[a-z]*" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
set_target_properties(cproton-ruby
PROPERTIES
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org