Attachment 84833 Details for Bug 68610 – _dbus_win_startup_winsock: be thread-safe

[patch] _dbus_win_startup_winsock: be thread-safe

0004-_dbus_win_startup_winsock-be-thread-safe.patch (text/plain), 2.00 KB, created by Simon McVittie on 2013-08-29 12:06:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-08-29 12:06:49 UTC

Size: 2.00 KB

patch

obsolete

>From a3a7765c3f0d9f1ce71a56a646a66f53a690e841 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 29 Aug 2013 12:51:14 +0100
>Subject: [PATCH 4/5] _dbus_win_startup_winsock: be thread-safe
>
>---
> dbus/dbus-sysdeps-win.c | 35 ++++++++++++++++++++++++++++-------
> 1 file changed, 28 insertions(+), 7 deletions(-)
>
>diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
>index 1039cc6..68bd3a1 100644
>--- a/dbus/dbus-sysdeps-win.c
>+++ b/dbus/dbus-sysdeps-win.c
>@@ -672,21 +672,26 @@ _dbus_connect_named_pipe (const char     *path,
> 
> #endif
> 
>-
>-
>-void
>+/**
>+ * @returns #FALSE if no memory
>+ */
>+dbus_bool_t
> _dbus_win_startup_winsock (void)
> {
>   /* Straight from MSDN, deuglified */
> 
>+  /* Protected by _DBUS_LOCK_sysdeps */
>   static dbus_bool_t beenhere = FALSE;
> 
>   WORD wVersionRequested;
>   WSADATA wsaData;
>   int err;
> 
>+  if (!_DBUS_LOCK (sysdeps))
>+    return FALSE;
>+
>   if (beenhere)
>-    return;
>+    goto out;
> 
>   wVersionRequested = MAKEWORD (2, 0);
> 
>@@ -710,6 +715,10 @@ _dbus_win_startup_winsock (void)
>     }
> 
>   beenhere = TRUE;
>+
>+out:
>+  _DBUS_UNLOCK (sysdeps);
>+  return TRUE;
> }
> 
> 
>@@ -1054,7 +1063,11 @@ _dbus_full_duplex_pipe (int        *fd1,
>   int len;
>   u_long arg;
> 
>-  _dbus_win_startup_winsock ();
>+  if (!_dbus_win_startup_winsock ())
>+    {
>+      _DBUS_SET_OOM (error);
>+      return FALSE;
>+    }
> 
>   temp = socket (AF_INET, SOCK_STREAM, 0);
>   if (temp == INVALID_SOCKET)
>@@ -1498,7 +1511,11 @@ _dbus_connect_tcp_socket_with_nonce (const char     *host,
> 
>   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
> 
>-  _dbus_win_startup_winsock ();
>+  if (!_dbus_win_startup_winsock ())
>+    {
>+      _DBUS_SET_OOM (error);
>+      return -1;
>+    }
> 
>   _DBUS_ZERO (hints);
> 
>@@ -1643,7 +1660,11 @@ _dbus_listen_tcp_socket (const char     *host,
>   *fds_p = NULL;
>   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
> 
>-  _dbus_win_startup_winsock ();
>+  if (!_dbus_win_startup_winsock ())
>+    {
>+      _DBUS_SET_OOM (error);
>+      return -1;
>+    }
> 
>   _DBUS_ZERO (hints);
> 
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 68610: 84714 | 84715 | 84830 | 84831 | 84832 | 84833 | 84834 | 84837 | 85080 | 85113 | 85241

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.