BUGFIX prevent specific rare deadlocks

Fixes #233
CESNET · Sep 15, 2016 · a2da916 · a2da916
1 parent 4190f35
commit a2da916
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/session.c b/src/session.c
@@ -2402,6 +2402,9 @@ API NC_MSG_TYPE nc_session_recv_reply(struct nc_session* session, int timeout, n
 
 	ret = nc_session_recv_msg(session, local_timeout, &msg);
 
+	DBG_UNLOCK("mut_mqueue");
+	pthread_mutex_unlock(&(session->mut_mqueue));
+
 	switch (ret) {
 	case NC_MSG_REPLY: /* regular reply received */
 		/* if specified callback for processing rpc-error, use it */
@@ -2435,6 +2438,9 @@ API NC_MSG_TYPE nc_session_recv_reply(struct nc_session* session, int timeout, n
 		break;
 	case NC_MSG_WOULDBLOCK:
 		if ((timeout == -1) || ((timeout > 0) && ((timeout = timeout - local_timeout) > 0))) {
+			/* lock again */
+			DBG_LOCK("mut_mqueue");
+			pthread_mutex_lock(&(session->mut_mqueue));
 			goto try_again;
 		}
 		break;
@@ -2460,10 +2466,6 @@ API NC_MSG_TYPE nc_session_recv_reply(struct nc_session* session, int timeout, n
 		break;
 	}
 
-	/* session lock is no more needed */
-	DBG_UNLOCK("mut_mqueue");
-	pthread_mutex_unlock(&(session->mut_mqueue));
-
 	return (ret);
 }