diff options
author | Nicolas Ruff <nruff@google.com> | 2014-08-18 15:22:48 +0200 |
---|---|---|
committer | Nicolas Ruff <nruff@google.com> | 2014-08-18 15:22:48 +0200 |
commit | 05a9bd41a8ec0a9d580a8f420f41718bdd235446 (patch) | |
tree | 359ac608feab381bd58953717521d1c98e87a2df | |
parent | 6037a9074d52b1963c97cb28ea1096c7c14cbf28 (diff) | |
download | libvncserver-05a9bd41a8ec0a9d580a8f420f41718bdd235446.zip libvncserver-05a9bd41a8ec0a9d580a8f420f41718bdd235446.tar.gz |
Do not accept a scaling factor of zero on PalmVNCSetScaleFactor and SetScale client->server messages. This would cause a division by zero and crash the server.
-rw-r--r-- | libvncserver/rfbserver.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c index 7e43fe3..df7d74c 100644 --- a/libvncserver/rfbserver.c +++ b/libvncserver/rfbserver.c @@ -2491,6 +2491,13 @@ rfbProcessClientNormalMessage(rfbClientPtr cl) rfbCloseClient(cl); return; } + + if (msg.ssc.scale == 0) { + rfbLogPerror("rfbProcessClientNormalMessage: will not accept a scale factor of zero"); + rfbCloseClient(cl); + return; + } + rfbStatRecordMessageRcvd(cl, msg.type, sz_rfbSetScaleMsg, sz_rfbSetScaleMsg); rfbLog("rfbSetScale(%d)\n", msg.ssc.scale); rfbScalingSetup(cl,cl->screen->width/msg.ssc.scale, cl->screen->height/msg.ssc.scale); @@ -2507,6 +2514,13 @@ rfbProcessClientNormalMessage(rfbClientPtr cl) rfbCloseClient(cl); return; } + + if (msg.ssc.scale == 0) { + rfbLogPerror("rfbProcessClientNormalMessage: will not accept a scale factor of zero"); + rfbCloseClient(cl); + return; + } + rfbStatRecordMessageRcvd(cl, msg.type, sz_rfbSetScaleMsg, sz_rfbSetScaleMsg); rfbLog("rfbSetScale(%d)\n", msg.ssc.scale); rfbScalingSetup(cl,cl->screen->width/msg.ssc.scale, cl->screen->height/msg.ssc.scale); |