net/FakeSocket.cpp |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9c57ffd3b36196ba94a213eee451b8820f67692a
Author:     Tor Lillqvist <t...@collabora.com>
AuthorDate: Wed Sep 19 17:03:52 2018 +0300
Commit:     Tor Lillqvist <t...@collabora.com>
CommitDate: Wed Sep 19 17:55:14 2018 +0300

    Avoid potential deadlock

diff --git a/net/FakeSocket.cpp b/net/FakeSocket.cpp
index 99480dc4d..384c0ab3d 100644
--- a/net/FakeSocket.cpp
+++ b/net/FakeSocket.cpp
@@ -398,6 +398,8 @@ int fakeSocketAccept4(int fd, int flags)
     while (pair.connectingFd == -1)
         cv.wait(cvLock);
     
+    cvLock.unlock();
+
     assert(pair.connectingFd >= 0 && pair.connectingFd/2 < fds.size());
 
     FakeSocketPair& pair2 = fds[pair.connectingFd/2];
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to