Avoiding null pointer dereference (#1062)

2 files changed, 4 insertions, 1 deletions

diff --git a/src/core/sock.c b/src/core/sock.c
index 8348d30..cac05da 100644
--- a/src/core/sock.c
+++ b/src/core/sock.c
@@ -503,6 +503,9 @@ int nn_sock_add_ep (struct nn_sock *self, const struct nn_transport *transport,
 
     /*  Instantiate the endpoint. */
     ep = nn_alloc (sizeof (struct nn_ep), "endpoint");
+    if (!ep) {
+        return -ENOMEM;
+    }
     rc = nn_ep_init (ep, NN_SOCK_SRC_EP, self, self->eid, transport,
         bind, addr);
     if (nn_slow (rc < 0)) {
diff --git a/src/transports/tcp/btcp.c b/src/transports/tcp/btcp.c
index 58e6d3e..89423e5 100644
--- a/src/transports/tcp/btcp.c
+++ b/src/transports/tcp/btcp.c
@@ -113,8 +113,8 @@ int nn_btcp_create (struct nn_ep *ep)
 
     /*  Allocate the new endpoint object. */
     self = nn_alloc (sizeof (struct nn_btcp), "btcp");
-    self->ep = ep;
     alloc_assert (self);
+    self->ep = ep;
 
     nn_ep_tran_setup (ep, &nn_btcp_ep_ops, self);
     addr = nn_ep_getaddr (ep);