Commit a549c3aa authored by runge's avatar runge

In rfbSendFileTransferChunk() check permitFileTransfer 1st to avoid false alarms.

parent a2707712
...@@ -1310,10 +1310,11 @@ rfbBool rfbSendFileTransferChunk(rfbClientPtr cl) ...@@ -1310,10 +1310,11 @@ rfbBool rfbSendFileTransferChunk(rfbClientPtr cl)
/* /*
* Don't close the client if we get into this one because * Don't close the client if we get into this one because
* it is called from many places to service file transfers. * it is called from many places to service file transfers.
* Note that permitFileTransfer is checked first.
*/ */
if ((cl->screen->getFileTransferPermission != NULL if (cl->screen->permitFileTransfer != TRUE ||
&& cl->screen->getFileTransferPermission(cl) != TRUE) (cl->screen->getFileTransferPermission != NULL
|| cl->screen->permitFileTransfer != TRUE) { && cl->screen->getFileTransferPermission(cl) != TRUE)) {
return TRUE; return TRUE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment