Robert Shearman : server: Don't set the client' s server field before the server has

Alexandre Julliard julliard at wine.codeweavers.com
Thu Jun 8 05:06:08 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 43890d88f7491ec886c629b0452ffa5b5f790068
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=43890d88f7491ec886c629b0452ffa5b5f790068

Author: Robert Shearman <rob at codeweavers.com>
Date:   Wed Jun  7 20:11:59 2006 +0100

server: Don't set the client's server field before the server has
changed into a connected state, otherwise we could assert in
pipe_client_destroy.

---

 server/named_pipe.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/named_pipe.c b/server/named_pipe.c
index 2eda03e..5c4da77 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -637,7 +637,7 @@ static struct pipe_server *create_pipe_s
     return server;
 }
 
-static struct pipe_client *create_pipe_client( struct pipe_server *server, unsigned int flags )
+static struct pipe_client *create_pipe_client( unsigned int flags )
 {
     struct pipe_client *client;
 
@@ -646,7 +646,7 @@ static struct pipe_client *create_pipe_c
         return NULL;
 
     client->fd = NULL;
-    client->server = server;
+    client->server = NULL;
     client->flags = flags;
 
     return client;
@@ -762,7 +762,7 @@ DECL_HANDLER(open_named_pipe)
         return;
     }
 
-    client = create_pipe_client( server, req->flags );
+    client = create_pipe_client( req->flags );
     if (client)
     {
         if (!socketpair( PF_UNIX, SOCK_STREAM, 0, fds ))




More information about the wine-cvs mailing list