diff options
| author | marha <marha@users.sourceforge.net> | 2015-03-22 13:30:59 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-03-22 13:30:59 +0100 |
| commit | 82c8df11062f72a7d467e26cedbbd8b322ff7a70 (patch) | |
| tree | 7e7a3e408d09d3e50ff0d2f9befeb5b7ab5617a5 /xorg-server/os | |
| parent | 8574eba804031f6b19713f0b02952280730bf62e (diff) | |
| download | vcxsrv-82c8df11062f72a7d467e26cedbbd8b322ff7a70.tar.gz vcxsrv-82c8df11062f72a7d467e26cedbbd8b322ff7a70.tar.bz2 vcxsrv-82c8df11062f72a7d467e26cedbbd8b322ff7a70.zip | |
randrproto fontconfig libX11 libXdmcp libxcb mesa xkbcomp xserver git update 22 Mar 2015
xserver commit 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56
libxcb commit a90be9955d2c5a635f791d44db1154633b9d3322
libX11 commit 5a499ca7b064bf7e6a4fcc169f22862dce0c60c5
libXdmcp commit 0c09444d276fbf46a0e8b427a4f6a325d0625742
xkbcomp commit fc3e6ddb2c8e922ea80f2dc5cbc1df2102e30d99
randrproto commit b1ba68df8a5fc113a387123ec2f312195e28e47f
fontconfig commit 69ff6b6e260584e383c38b1b7034ddcbb23d214f
mesa commit 397b491173f0d2df4deb44d21c170bf16840d507
Diffstat (limited to 'xorg-server/os')
| -rw-r--r-- | xorg-server/os/access.c | 2 | ||||
| -rw-r--r-- | xorg-server/os/connection.c | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/xorg-server/os/access.c b/xorg-server/os/access.c index 28f2d3213..8fa028eb4 100644 --- a/xorg-server/os/access.c +++ b/xorg-server/os/access.c @@ -1392,7 +1392,7 @@ InvalidHost(register struct sockaddr *saddr, int len, ClientPtr client) } for (host = validhosts; host; host = host->next) { if (host->family == FamilyServerInterpreted) { - if (addr && siAddrMatch(family, addr, len, host, client)) { + if (siAddrMatch(family, addr, len, host, client)) { return 0; } } diff --git a/xorg-server/os/connection.c b/xorg-server/os/connection.c index ddfe50a3e..7ff44e175 100644 --- a/xorg-server/os/connection.c +++ b/xorg-server/os/connection.c @@ -513,8 +513,13 @@ CloseWellKnownConnections(void) { int i; - for (i = 0; i < ListenTransCount; i++) - _XSERVTransClose(ListenTransConns[i]); + for (i = 0; i < ListenTransCount; i++) { + if (ListenTransConns[i] != NULL) { + _XSERVTransClose(ListenTransConns[i]); + ListenTransConns[i] = NULL; + } + } + ListenTransCount = 0; } static void |