diff options
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | libvncserver/main.c | 3 | ||||
| -rw-r--r-- | libvncserver/rfbserver.c | 2 |
4 files changed, 6 insertions, 4 deletions
@@ -29,7 +29,7 @@ Oliver Mihatsch, Greg Sternberg, Werner Hofer, Giampiero Giancipoli, Glenn Mabutt, Paul Kreiner, Erik Kunze, Mike Frysinger, Martin Waitz, Mark McLoughlin, Paul Fox, Juan Jose Costello, Andre Leiadella, Alberto Lusiani, Malvina Mazin, Dave Stuart, Rohit Kumar, Donald Dugger, -Steven Carr, and Uwe Völker. +Steven Carr, Uwe Völker, and Charles Coffing. Probably I forgot quite a few people sending a patch here and there, which really made a difference. Without those, some obscure bugs still would @@ -1,3 +1,6 @@ +2007-03-17 Charles Coffing <cconffing@novell.com> + * libvncserver: fix a locking issue + 2007-02-01 Johannes E. Schindelin <Johannes.Schindelin@gmx.de> * libvncclient: add updateRect member to rfbClient, to allow requesting smaller updates than whole-screen. diff --git a/libvncserver/main.c b/libvncserver/main.c index 3af90ca..52bd4e7 100644 --- a/libvncserver/main.c +++ b/libvncserver/main.c @@ -455,12 +455,11 @@ clientOutput(void *data) haveUpdate = sraRgnAnd(updateRegion,cl->requestedRegion); sraRgnDestroy(updateRegion); } - UNLOCK(cl->updateMutex); if (!haveUpdate) { WAIT(cl->updateCond, cl->updateMutex); - UNLOCK(cl->updateMutex); /* we really needn't lock now. */ } + UNLOCK(cl->updateMutex); } /* OK, now, to save bandwidth, wait a little while for more diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c index 0c7f584..434d59d 100644 --- a/libvncserver/rfbserver.c +++ b/libvncserver/rfbserver.c @@ -500,9 +500,9 @@ rfbClientConnectionGone(rfbClientPtr cl) do { LOCK(cl->refCountMutex); i=cl->refCount; - UNLOCK(cl->refCountMutex); if(i>0) WAIT(cl->deleteCond,cl->refCountMutex); + UNLOCK(cl->refCountMutex); } while(i>0); } #endif |