From 89dfc561f119f4775c439f5b9871d5947eaeeb4c Mon Sep 17 00:00:00 2001 From: Sarit Zubakov Date: Wed, 29 Mar 2017 15:28:10 +0000 Subject: [PATCH] src/msg/async: Update fix broken compilation for Posix This commit relates to PR#13940 issue: 1010987 Change-Id: I402812adcf816c145356f0b98cfd1869c4cd5400 Signed-off-by: Sarit Zubakov --- src/msg/async/PosixStack.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/msg/async/PosixStack.cc b/src/msg/async/PosixStack.cc index b24febd75a29..0422b4e26b71 100644 --- a/src/msg/async/PosixStack.cc +++ b/src/msg/async/PosixStack.cc @@ -278,12 +278,14 @@ int PosixServerSocketImpl::accept(ConnectedSocket *sock, const SocketOptions &op ::close(sd); return -errno; } + + assert(NULL != out); //out should not be NULL in accept connection + + out->set_sockaddr((sockaddr*)&ss); handler.set_priority(sd, opt.priority, out->get_family()); std::unique_ptr csi(new PosixConnectedSocketImpl(handler, *out, sd, true)); *sock = ConnectedSocket(std::move(csi)); - if (out) - out->set_sockaddr((sockaddr*)&ss); return 0; } -- 2.47.3