commit 54ea296a8d5abf5be5c7d4b8a5cd6270ef5ed1d4
author Robin Jarry <robin.jarry@6wind.com> Wed Oct 10 10:33:40 2018 +0200
committer Robin Jarry <robin.jarry@6wind.com> Wed Oct 10 12:36:14 2018 +0200
tree 7601bb3012b622a22e13cc45d7a29d2ecadaf250
parent 56bdeb58281615552787dbb43023c54ede69c50e

session: fix lock on wrong mutex

This fixes a segfault when running nc_connect_ssh_channel().

 #0  __GI___pthread_mutex_lock (mutex=0x0) at ../nptl/pthread_mutex_lock.c:65
 #1  0x00007f0b38c0edf8 in nc_session_io_lock (session=0x561dc93a73b0, timeout=-1,
     func=0x7f0b38c36d60 <__func__.24731> "nc_connect_ssh_channel")
     at libnetconf2/src/session.c:347
 #2  0x00007f0b38c25f23 in nc_connect_ssh_channel (session=0x561dc8cc3200, ctx=0x561dc8cc7130)
     at libnetconf2/src/session_client_ssh.c:1753

Fixes: 131120aa5693 ("CHANGE allow concurrent notifications and RPCs")
Signed-off-by: Robin Jarry <robin.jarry@6wind.com>

src/session.c

diff --git a/src/session.c b/src/session.c
index 40d656d..0f3b253 100644
--- a/src/session.c
+++ b/src/session.c
@@ -344,7 +344,7 @@
     } else if (!timeout) {
         ret = pthread_mutex_trylock(session->io_lock);
     } else { /* timeout == -1 */
-        ret = pthread_mutex_lock(session->opts.server.rpc_lock);
+        ret = pthread_mutex_lock(session->io_lock);
     }
 
     if (ret) {