This is an automated email from the ASF dual-hosted git repository.
jamesge pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-brpc.git
The following commit(s) were added to refs/heads/master by this push:
new d465115 Fix a null deref in controller.cpp
d465115 is described below
commit d465115cb41d2899ab30165fd2ee0946700e2a75
Author: jamesge <jge...@gmail.com>
AuthorDate: Mon Oct 28 21:24:54 2019 -0700
Fix a null deref in controller.cpp
---
src/brpc/controller.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/brpc/controller.cpp b/src/brpc/controller.cpp
index 3f475b7..c70fb43 100644
--- a/src/brpc/controller.cpp
+++ b/src/brpc/controller.cpp
@@ -830,7 +830,7 @@ void Controller::EndRPC(const CompletionInfo& info) {
<< info.id << " current_cid=" << current_id()
<< " initial_cid=" << _correlation_id
<< " stream_user_data=" <<
_current_call.stream_user_data
- << " sending_sock=" << *_current_call.sending_sock;
+ << " sending_sock=" <<
_current_call.sending_sock.get();
}
_current_call.OnComplete(this, ECANCELED, false, false);
if (_unfinished_call != NULL) {
@@ -1039,7 +1039,7 @@ void Controller::IssueRPC(int64_t start_realtime_us) {
}
// Handle connection type
if (_connection_type == CONNECTION_TYPE_SINGLE ||
- _stream_creator != NULL) { // let user decides the sending_socket
+ _stream_creator != NULL) { // let user decides the sending_sock
// in the callback(according to connection_type) directly
_current_call.sending_sock.reset(tmp_sock.release());
// TODO(gejun): Setting preferred index of single-connected socket
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@brpc.apache.org
For additional commands, e-mail: dev-h...@brpc.apache.org
